Index: ossp-pkg/uuid/uuid.c RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/uuid.c,v rcsdiff -q -kk '-r1.16' '-r1.17' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/uuid.c,v' 2>/dev/null --- uuid.c 2004/01/10 17:01:22 1.16 +++ uuid.c 2004/01/10 19:17:39 1.17 @@ -380,7 +380,7 @@ if (i == UUID_LEN_STR) if (*cp == '\0') continue; - if (!isxdigit(*cp)) + if (!isxdigit((int)(*cp))) return FALSE; } return TRUE; Index: ossp-pkg/uuid/uuid_mac.c RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/uuid_mac.c,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/uuid_mac.c,v' 2>/dev/null --- uuid_mac.c 2004/01/10 18:50:24 1.2 +++ uuid_mac.c 2004/01/10 19:17:39 1.3 @@ -30,9 +30,11 @@ #include "config.h" #include "uuid_mac.h" +#include #include #include #include +#include #include #include #include @@ -49,13 +51,16 @@ #ifdef HAVE_SYS_SOCKIO_H #include #endif +#ifdef HAVE_NETDB_H +#include +#endif #ifdef HAVE_NET_IF_H #include #endif #ifdef HAVE_NET_IF_DL_H #include #endif -#ifdef HAVE_IF_ARP_H +#ifdef HAVE_NET_IF_ARP_H #include #endif #ifdef HAVE_NETINET_IN_H @@ -116,6 +121,7 @@ struct ifreq ifr; struct sockaddr *sa; int s; + int i; if ((s = socket(PF_INET, SOCK_DGRAM, 0)) < 0) return FALSE; @@ -139,15 +145,17 @@ struct hostent *he; struct arpreq ar; struct sockaddr_in *sa; + int s; + int i; if (gethostname(hostname, sizeof(hostname)) < 0) return FALSE; - if ((he = gethostbyname(hostname)) < 0) + if ((he = gethostbyname(hostname)) == NULL) return FALSE; if ((s = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) return FALSE; memset(&ar, '\0', sizeof(ar)); - sa = (struct sockaddr_in *)&(ar.arp_pa); + sa = (struct sockaddr_in *)((void *)&(ar.arp_pa)); sa->sin_family = AF_INET; memcpy(&(sa->sin_addr), *(he->h_addr_list), sizeof(struct in_addr)); if (ioctl(s, SIOCGARP, &ar) < 0) {