diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-01-22 21:48:03 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-01-22 21:48:03 +0000 |
| commit | 0fcbeb515df8d1e45ccfbdace5b45653846c747f (patch) | |
| tree | 18a83d6a9152115190c74cabf28d3c8d85cbe104 /include/arpa | |
| parent | b077ac3d3a8974b4166c58200100eda9c12aa3bb (diff) | |
Remove unnecessary typedef usage.
u_char -> unsigned char
u_short -> unsigned short
u_long -> unsigned long
u_int -> unsigned int
okay millert@
Diffstat (limited to 'include/arpa')
| -rw-r--r-- | include/arpa/inet.h | 6 | ||||
| -rw-r--r-- | include/arpa/nameser.h | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/arpa/inet.h b/include/arpa/inet.h index 63c42ac4111..4f177917c24 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -1,4 +1,4 @@ -/* $OpenBSD: inet.h,v 1.9 2003/08/01 17:38:33 avsm Exp $ */ +/* $OpenBSD: inet.h,v 1.10 2004/01/22 21:48:02 espie Exp $ */ /* * ++Copyright++ 1983, 1993 @@ -86,8 +86,8 @@ char *inet_ntoa(struct in_addr); int inet_pton(int, const char *, void *); const char *inet_ntop(int, const void *, char *, size_t) __attribute__ ((__bounded__(__string__,3,4))); -u_int inet_nsap_addr(const char *, u_char *, int); -char *inet_nsap_ntoa(int, const u_char *, char *); +unsigned int inet_nsap_addr(const char *, unsigned char *, int); +char *inet_nsap_ntoa(int, const unsigned char *, char *); __END_DECLS #endif /* !_INET_H_ */ diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index ee5c82d78d0..70e4eae2799 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nameser.h,v 1.9 2004/01/17 21:01:31 jakob Exp $ */ +/* $OpenBSD: nameser.h,v 1.10 2004/01/22 21:48:02 espie Exp $ */ /* * ++Copyright++ 1983, 1989, 1993 @@ -361,8 +361,8 @@ typedef struct { */ #define INDIR_MASK 0xc0 -extern u_int16_t _getshort(const u_char *); -extern u_int32_t _getlong(const u_char *); +extern u_int16_t _getshort(const unsigned char *); +extern u_int32_t _getlong(const unsigned char *); /* * Inline versions of get/put short/long. Pointer is advanced. @@ -371,7 +371,7 @@ extern u_int32_t _getlong(const u_char *); * portable or it can be elegant but rarely both. */ #define GETSHORT(s, cp) { \ - register u_char *t_cp = (u_char *)(cp); \ + unsigned char *t_cp = (unsigned char *)(cp); \ (s) = ((u_int16_t)t_cp[0] << 8) \ | ((u_int16_t)t_cp[1]) \ ; \ @@ -379,7 +379,7 @@ extern u_int32_t _getlong(const u_char *); } #define GETLONG(l, cp) { \ - register u_char *t_cp = (u_char *)(cp); \ + unsigned char *t_cp = (unsigned char *)(cp); \ (l) = ((u_int32_t)t_cp[0] << 24) \ | ((u_int32_t)t_cp[1] << 16) \ | ((u_int32_t)t_cp[2] << 8) \ @@ -389,16 +389,16 @@ extern u_int32_t _getlong(const u_char *); } #define PUTSHORT(s, cp) { \ - register u_int16_t t_s = (u_int16_t)(s); \ - register u_char *t_cp = (u_char *)(cp); \ + u_int16_t t_s = (u_int16_t)(s); \ + unsigned char *t_cp = (unsigned char *)(cp); \ *t_cp++ = t_s >> 8; \ *t_cp = t_s; \ (cp) += INT16SZ; \ } #define PUTLONG(l, cp) { \ - register u_int32_t t_l = (u_int32_t)(l); \ - register u_char *t_cp = (u_char *)(cp); \ + u_int32_t t_l = (u_int32_t)(l); \ + unsigned char *t_cp = (unsigned char *)(cp); \ *t_cp++ = t_l >> 24; \ *t_cp++ = t_l >> 16; \ *t_cp++ = t_l >> 8; \ |