From 3daff6958946d7ce7d3074b55e15eb6f13ace01a Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Wed, 4 Apr 2001 21:36:19 +0000 Subject: [PATCH] use-consistent-data-typing-for-hosts-20010404 use afs_uint32 everywhere --- src/util/afsutil.h | 2 +- src/util/hostparse.c | 12 ++++++------ src/util/netutils.c | 42 +++++++++++++++++++++--------------------- src/util/netutils.h | 20 ++++++++++---------- src/util/uuid.c | 3 ++- 5 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/util/afsutil.h b/src/util/afsutil.h index 4256620b5..faf824649 100644 --- a/src/util/afsutil.h +++ b/src/util/afsutil.h @@ -57,7 +57,7 @@ extern char *vctime(const time_t *atime); /* Convert a 4 byte integer to a text string. */ -extern char* afs_inet_ntoa(afs_int32 addr); +extern char* afs_inet_ntoa(afs_uint32 addr); /* copy strings, converting case along the way. */ diff --git a/src/util/hostparse.c b/src/util/hostparse.c index c9d32e462..f0ba15769 100644 --- a/src/util/hostparse.c +++ b/src/util/hostparse.c @@ -41,7 +41,7 @@ register char *ahost; { static char *addrp[2]; static char addr[4]; register char *ptr = ahost; - afs_int32 tval, numeric=0; + afs_uint32 tval, numeric=0; int dots=0; tc = *ahost; /* look at the first char */ @@ -103,7 +103,7 @@ register char *ahost; { * variable addr is in network byte order. */ char *hostutil_GetNameByINet(addr) - afs_int32 addr; + afs_uint32 addr; { struct hostent *th; static char tbuffer[256]; @@ -130,7 +130,7 @@ char *hostutil_GetNameByINet(addr) ** w.x.y.z # machineName ** returns the network interface in network byte order */ -afs_int32 +afs_uint32 extractAddr(line, maxSize) char* line; int maxSize; @@ -138,8 +138,8 @@ int maxSize; char byte1[32], byte2[32], byte3[32], byte4[32]; int i=0; char* endPtr; - afs_int32 val1, val2, val3, val4; - afs_int32 val=0; + afs_uint32 val1, val2, val3, val4; + afs_uint32 val=0; /* skip empty spaces */ while ( isspace(*line) && maxSize ) @@ -224,7 +224,7 @@ int maxSize; ** On Solaris, if we pass a 4 byte integer directly into inet_ntoa(), it ** causes a memory fault. */ -char* afs_inet_ntoa(afs_int32 addr) +char* afs_inet_ntoa(afs_uint32 addr) { struct in_addr temp; temp.s_addr = addr; diff --git a/src/util/netutils.c b/src/util/netutils.c index 9d29757cc..6cd16c0e7 100644 --- a/src/util/netutils.c +++ b/src/util/netutils.c @@ -38,7 +38,7 @@ ** w.x.y.z # machineName * returns the network interface IP Address in NBO */ -u_long +afs_uint32 extract_Addr(line, maxSize) char* line; int maxSize; @@ -46,8 +46,8 @@ int maxSize; char bytes[4][32]; int i=0,n=0; char* endPtr; - u_long val[4]; - u_long retval=0; + afs_uint32 val[4]; + afs_uint32 retval=0; /* skip empty spaces */ while ( isspace(*line) && maxSize ) { @@ -96,8 +96,8 @@ int maxSize; * parsed by extract_Addr(). */ int parseNetRestrictFile(outAddrs, mask, mtu, maxAddrs, nAddrs, reason, fileName) - afs_int32 outAddrs[]; /* output address array */ - afs_int32 *mask, *mtu; /* optional mask and mtu */ + afs_uint32 outAddrs[]; /* output address array */ + afs_uint32 *mask, *mtu; /* optional mask and mtu */ afs_uint32 maxAddrs; /* max number of addresses */ afs_uint32 *nAddrs; /* number of Addresses in output array */ char reason[]; /* reason for failure */ @@ -107,7 +107,7 @@ int parseNetRestrictFile(outAddrs, mask, mtu, maxAddrs, nAddrs, reason, fileName char line[MAX_NETFILE_LINE]; int lineNo, usedfile; afs_uint32 i, neaddrs, nfaddrs, nOutaddrs; - afs_int32 addr, eAddrs[MAXIPADDRS], eMask[MAXIPADDRS], eMtu[MAXIPADDRS]; + afs_uint32 addr, eAddrs[MAXIPADDRS], eMask[MAXIPADDRS], eMtu[MAXIPADDRS]; assert(outAddrs); assert(reason); @@ -196,17 +196,17 @@ int parseNetRestrictFile(outAddrs, mask, mtu, maxAddrs, nAddrs, reason, fileName */ int ParseNetInfoFile(final, mask, mtu, max, reason, fileName) -afs_int32 *final, *mask, *mtu; +afs_uint32 *final, *mask, *mtu; int max; /* max number of interfaces */ char reason[]; const char *fileName; { - afs_int32 existingAddr[MAXIPADDRS], existingMask[MAXIPADDRS], existingMtu[MAXIPADDRS]; + afs_uint32 existingAddr[MAXIPADDRS], existingMask[MAXIPADDRS], existingMtu[MAXIPADDRS]; char line[MAX_NETFILE_LINE]; FILE* fp; int i, existNu, count = 0; - afs_int32 addr; + afs_uint32 addr; int lineNo=0; int l; @@ -294,13 +294,13 @@ const char *fileName; * entries. */ int filterAddrs(addr1,addr2,mask1,mask2,mtu1,mtu2,n1,n2) -u_long addr1[],addr2[]; -afs_int32 mask1[], mask2[]; -afs_int32 mtu1[], mtu2[]; +afs_uint32 addr1[],addr2[]; +afs_uint32 mask1[], mask2[]; +afs_uint32 mtu1[], mtu2[]; { - u_long taddr[MAXIPADDRS]; - afs_int32 tmask[MAXIPADDRS]; - afs_int32 tmtu[MAXIPADDRS]; + afs_uint32 taddr[MAXIPADDRS]; + afs_uint32 tmask[MAXIPADDRS]; + afs_uint32 tmtu[MAXIPADDRS]; int count=0,i=0,j=0,found=0; assert(addr1); @@ -349,16 +349,16 @@ afs_int32 mtu1[], mtu2[]; * set of IP addresses to use */ int parseNetFiles(addrbuf, maskbuf,mtubuf,max,reason, niFileName, nrFileName) -afs_int32 addrbuf[]; -afs_int32 maskbuf[]; -afs_int32 mtubuf[]; -u_long max; /* Entries in addrbuf, maskbuf and mtubuf */ +afs_uint32 addrbuf[]; +afs_uint32 maskbuf[]; +afs_uint32 mtubuf[]; +afs_uint32 max; /* Entries in addrbuf, maskbuf and mtubuf */ char reason[]; const char *niFileName; const char *nrFileName; { - afs_int32 addrbuf1[MAXIPADDRS],maskbuf1[MAXIPADDRS], mtubuf1[MAXIPADDRS]; - afs_int32 addrbuf2[MAXIPADDRS],maskbuf2[MAXIPADDRS], mtubuf2[MAXIPADDRS]; + afs_uint32 addrbuf1[MAXIPADDRS],maskbuf1[MAXIPADDRS], mtubuf1[MAXIPADDRS]; + afs_uint32 addrbuf2[MAXIPADDRS],maskbuf2[MAXIPADDRS], mtubuf2[MAXIPADDRS]; int nAddrs1=0; afs_uint32 nAddrs2=0; int code,i; diff --git a/src/util/netutils.h b/src/util/netutils.h index 9faedeb17..a7d938f79 100644 --- a/src/util/netutils.h +++ b/src/util/netutils.h @@ -17,9 +17,9 @@ /* Network and IP address utility and file parsing functions */ extern int parseNetRestrictFile( - afs_int32 outAddrs[], - afs_int32 mask[], - afs_int32 mtu[], + afs_uint32 outAddrs[], + afs_uint32 mask[], + afs_uint32 mtu[], afs_uint32 maxAddrs, afs_uint32 *nAddrs, char reason[], @@ -27,16 +27,16 @@ extern int parseNetRestrictFile( ); extern int filterAddrs( - u_long addr1[],u_long addr2[], - afs_int32 mask1[], afs_int32 mask2[], - afs_int32 mtu1[], afs_int32 mtu2[] + afs_uint32 addr1[],afs_uint32 addr2[], + afs_uint32 mask1[], afs_uint32 mask2[], + afs_uint32 mtu1[], afs_uint32 mtu2[] ); extern int parseNetFiles( - afs_int32 addrbuf[], - afs_int32 maskbuf[], - afs_int32 mtubuf[], - u_long max, + afs_uint32 addrbuf[], + afs_uint32 maskbuf[], + afs_uint32 mtubuf[], + afs_uint32 max, char reason[], const char *niFilename, const char *nrFilename diff --git a/src/util/uuid.c b/src/util/uuid.c index fa2a4a6bd..c73fe3ed7 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -294,7 +294,8 @@ void uuid__get_os_time (uuid_time_t *os_time) char hostName1[128] = "localhost"; static int uuid_get_address (uuid_address_p_t addr) { - afs_int32 code, addr1; + afs_int32 code; + afs_uint32 addr1; struct hostent *he; code = gethostname(hostName1, 64); -- 2.39.5