diff options
| -rw-r--r-- | usr.sbin/bootpd/bootpd.c | 4 | ||||
| -rw-r--r-- | usr.sbin/bootpd/dovend.c | 2 | ||||
| -rw-r--r-- | usr.sbin/bootpd/dumptab.c | 2 | ||||
| -rw-r--r-- | usr.sbin/bootpd/hash.c | 16 | ||||
| -rw-r--r-- | usr.sbin/bootpd/readfile.c | 18 |
5 files changed, 21 insertions, 21 deletions
diff --git a/usr.sbin/bootpd/bootpd.c b/usr.sbin/bootpd/bootpd.c index 8f19436789c..e95741ebdfb 100644 --- a/usr.sbin/bootpd/bootpd.c +++ b/usr.sbin/bootpd/bootpd.c @@ -21,7 +21,7 @@ SOFTWARE. ************************************************************************/ #ifndef lint -static char rcsid[] = "$Id: bootpd.c,v 1.9 2001/01/16 23:34:41 deraadt Exp $"; +static char rcsid[] = "$Id: bootpd.c,v 1.10 2002/05/27 19:49:58 deraadt Exp $"; #endif /* @@ -610,7 +610,7 @@ handle_request() struct host *hp = NULL; struct host dummyhost; int32 bootsize = 0; - unsigned hlen, hashcode; + unsigned int hlen, hashcode; int32 dest; char realpath[MAXPATHLEN]; char *clntpath; diff --git a/usr.sbin/bootpd/dovend.c b/usr.sbin/bootpd/dovend.c index ba6ab288b8b..3adbdf3427e 100644 --- a/usr.sbin/bootpd/dovend.c +++ b/usr.sbin/bootpd/dovend.c @@ -293,7 +293,7 @@ insert_ip(tag, iplist, dest, bytesleft) int *bytesleft; { struct in_addr *addrptr; - unsigned addrcount = 1; + unsigned int addrcount = 1; byte *d; if (iplist == NULL) diff --git a/usr.sbin/bootpd/dumptab.c b/usr.sbin/bootpd/dumptab.c index 5893f6c4a23..b9baccac157 100644 --- a/usr.sbin/bootpd/dumptab.c +++ b/usr.sbin/bootpd/dumptab.c @@ -352,7 +352,7 @@ list_ipaddresses(fp, ipptr) FILE *fp; struct in_addr_list *ipptr; { - unsigned count; + unsigned int count; struct in_addr *addrptr; if (ipptr) { diff --git a/usr.sbin/bootpd/hash.c b/usr.sbin/bootpd/hash.c index 0f2649ba1a5..ec23d617b34 100644 --- a/usr.sbin/bootpd/hash.c +++ b/usr.sbin/bootpd/hash.c @@ -21,7 +21,7 @@ SOFTWARE. ************************************************************************/ #ifndef lint -static char rcsid[] = "$Id: hash.c,v 1.2 2002/03/14 16:44:24 mpech Exp $"; +static char rcsid[] = "$Id: hash.c,v 1.3 2002/05/27 19:49:58 deraadt Exp $"; #endif @@ -86,7 +86,7 @@ PRIVATE void hashi_FreeMembers P((hash_member *, hash_freefp)); hash_tbl * hash_Init(tablesize) - unsigned tablesize; + unsigned int tablesize; { hash_tbl *hashtblptr; unsigned int totalsize; @@ -142,7 +142,7 @@ hash_Reset(hashtable, free_data) hash_freefp free_data; { hash_member **bucketptr; - unsigned i; + unsigned int i; bucketptr = hashtable->table; for (i = 0; i < hashtable->size; i++) { @@ -175,7 +175,7 @@ hash_Reset(hashtable, free_data) * features of this package. */ -unsigned +unsigned int hash_HashFunction(string, len) unsigned char *string; unsigned int len; @@ -200,7 +200,7 @@ hash_HashFunction(string, len) int hash_Exists(hashtable, hashcode, compare, key) hash_tbl *hashtable; - unsigned hashcode; + unsigned int hashcode; hash_cmpfp compare; hash_datum *key; { @@ -231,7 +231,7 @@ hash_Exists(hashtable, hashcode, compare, key) int hash_Insert(hashtable, hashcode, compare, key, element) hash_tbl *hashtable; - unsigned hashcode; + unsigned int hashcode; hash_cmpfp compare; hash_datum *key, *element; { @@ -262,7 +262,7 @@ hash_Insert(hashtable, hashcode, compare, key, element) int hash_Delete(hashtable, hashcode, compare, key, free_data) hash_tbl *hashtable; - unsigned hashcode; + unsigned int hashcode; hash_cmpfp compare; hash_datum *key; hash_freefp free_data; @@ -328,7 +328,7 @@ hash_Delete(hashtable, hashcode, compare, key, free_data) hash_datum * hash_Lookup(hashtable, hashcode, compare, key) hash_tbl *hashtable; - unsigned hashcode; + unsigned int hashcode; hash_cmpfp compare; hash_datum *key; { diff --git a/usr.sbin/bootpd/readfile.c b/usr.sbin/bootpd/readfile.c index ff9e777e17d..35c9639f350 100644 --- a/usr.sbin/bootpd/readfile.c +++ b/usr.sbin/bootpd/readfile.c @@ -21,7 +21,7 @@ SOFTWARE. ************************************************************************/ #ifndef lint -static char rcsid[] = "$Id: readfile.c,v 1.5 2002/03/14 16:44:24 mpech Exp $"; +static char rcsid[] = "$Id: readfile.c,v 1.6 2002/05/27 19:49:58 deraadt Exp $"; #endif @@ -330,7 +330,7 @@ readtab(force) struct host *hp; FILE *fp; struct stat st; - unsigned hashcode, buflen; + unsigned int hashcode, buflen; static char buffer[MAXENTRYLEN]; /* @@ -510,7 +510,7 @@ PRIVATE void read_entry(fp, buffer, bufsiz) FILE *fp; char *buffer; - unsigned *bufsiz; + unsigned int *bufsiz; { int c, length; @@ -800,7 +800,7 @@ eval_symbol(symbol, hp) u_int32 value; int32 timeoff; int i, numsymbols; - unsigned len; + unsigned int len; int optype; /* Indicates boolean, addition, or deletion */ eat_whitespace(symbol); @@ -1167,7 +1167,7 @@ eval_symbol(symbol, hp) PRIVATE char * get_string(src, dest, length) char **src, *dest; - unsigned *length; + unsigned int *length; { int n, len, quoteflag; @@ -1222,7 +1222,7 @@ get_shared_string(src) { char retstring[MAXSTRINGLEN]; struct shared_string *s; - unsigned length; + unsigned int length; length = sizeof(retstring); (void) get_string(src, retstring, &length); @@ -1620,7 +1620,7 @@ get_addresses(src) struct in_addr tmpaddrlist[MAXINADDRS]; struct in_addr *address1, *address2; struct in_addr_list *result; - unsigned addrcount, totalsize; + unsigned int addrcount, totalsize; address1 = tmpaddrlist; for (addrcount = 0; addrcount < MAXINADDRS; addrcount++) { @@ -1781,7 +1781,7 @@ prs_haddr(src, htype) byte *hap; char tmpstr[MAXSTRINGLEN]; u_int tmplen; - unsigned hal; + unsigned int hal; char *p; hal = haddrlength(htype); /* Get length of this address type */ @@ -2029,7 +2029,7 @@ del_bindata(dataptr) PRIVATE char * smalloc(nbytes) - unsigned nbytes; + unsigned int nbytes; { char *retvalue; |