Fix LP64 botches introduced in last commit.

This commit is contained in:
kleink 1998-06-11 14:50:46 +00:00
parent ff16cd85c0
commit 41dc2c91bd
3 changed files with 24 additions and 18 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: mknetid.c,v 1.8 1998/06/08 06:53:48 lukem Exp $ */
/* $NetBSD: mknetid.c,v 1.9 1998/06/11 14:50:46 kleink Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: mknetid.c,v 1.8 1998/06/08 06:53:48 lukem Exp $");
__RCSID("$NetBSD: mknetid.c,v 1.9 1998/06/11 14:50:46 kleink Exp $");
#endif
/*
@ -229,7 +229,8 @@ read_passwd(fname)
const char *fname;
{
FILE *pfile;
int line_no, colon;
size_t line_no;
int colon;
size_t len;
char *p, *k, *u, *g;
@ -241,7 +242,8 @@ read_passwd(fname)
(p = fparseln(pfile, &len, &line_no, NULL, FPARSELN_UNESCALL));
free(p)) {
if (len == 0) {
warnx("%s line %d: empty line", fname, line_no);
warnx("%s line %lu: empty line", fname,
(unsigned long)line_no);
continue;
}
@ -250,8 +252,8 @@ read_passwd(fname)
colon++;
if (colon != 6) {
warnx("%s line %d: incorrect number of fields",
fname, line_no);
warnx("%s line %lu: incorrect number of fields",
fname, (unsigned long)line_no);
continue;
}
@ -303,7 +305,8 @@ read_group(fname)
const char *fname;
{
FILE *gfile;
int line_no, colon;
size_t line_no;
int colon;
size_t len;
char *p, *k, *u, *g;
@ -315,7 +318,8 @@ read_group(fname)
(p = fparseln(gfile, &len, &line_no, NULL, FPARSELN_UNESCALL));
free(p)) {
if (len == 0) {
warnx("%s line %d: empty line", fname, line_no);
warnx("%s line %lu: empty line", fname,
(unsigned long)line_no);
continue;
}
@ -324,8 +328,8 @@ read_group(fname)
colon++;
if (colon != 3) {
warnx("%s line %d: incorrect number of fields",
fname, line_no);
warnx("%s line %lu: incorrect number of fields",
fname, (unsigned long)line_no);
continue;
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: stdethers.c,v 1.10 1998/06/08 06:53:49 lukem Exp $ */
/* $NetBSD: stdethers.c,v 1.11 1998/06/11 14:50:47 kleink Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: stdethers.c,v 1.10 1998/06/08 06:53:49 lukem Exp $");
__RCSID("$NetBSD: stdethers.c,v 1.11 1998/06/11 14:50:47 kleink Exp $");
#endif
#include <sys/types.h>
@ -65,7 +65,7 @@ main(argc, argv)
{
struct ether_addr eth_addr;
FILE *data_file;
int line_no;
size_t line_no;
size_t len;
char *fname, *p, *h;
char hostname[MAXHOSTNAMELEN + 1];
@ -97,7 +97,8 @@ main(argc, argv)
if (ether_line(p, &eth_addr, hostname) == 0)
printf("%s\t%s\n", ether_ntoa(&eth_addr), hostname);
else
warnx("ignoring line %d: `%s'", line_no, p);
warnx("ignoring line %lu: `%s'",
(unsigned long)line_no, p);
}
exit(0);

View File

@ -1,4 +1,4 @@
/* $NetBSD: stdhosts.c,v 1.8 1998/06/08 06:53:49 lukem Exp $ */
/* $NetBSD: stdhosts.c,v 1.9 1998/06/11 14:50:47 kleink Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: stdhosts.c,v 1.8 1998/06/08 06:53:49 lukem Exp $");
__RCSID("$NetBSD: stdhosts.c,v 1.9 1998/06/11 14:50:47 kleink Exp $");
#endif
#include <sys/types.h>
@ -62,7 +62,7 @@ main(argc, argv)
{
struct in_addr host_addr;
FILE *data_file;
int line_no;
size_t line_no;
size_t len;
char *k, *v, *addr_string, *fname;
@ -99,7 +99,8 @@ main(argc, argv)
if (inet_aton(k, &host_addr) == 0 ||
(addr_string = inet_ntoa(host_addr)) == NULL)
warnx("%s line %d: syntax error", fname, line_no);
warnx("%s line %lu: syntax error", fname,
(unsigned long)line_no);
printf("%s %s\n", addr_string, v);
}