diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2022-02-25 03:50:56 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2022-02-25 03:50:56 +0100 |
| commit | 1b2920e3b63db2eddebeec7330ffe8b723055573 (patch) | |
| tree | 320982c5bbc3ae02e5ee98708354781235144849 /openbsd-compat/getrrsetbyname.c | |
| parent | Use PICFLAG instead of hard coding -fPIC. (diff) | |
| download | openssh-1b2920e3b63db2eddebeec7330ffe8b723055573.tar.xz openssh-1b2920e3b63db2eddebeec7330ffe8b723055573.zip | |
ANSIfy getshort and getlong.
These functions appear to have come from OpenBSD's lib/libc/net/res_comp.c
which made this change in 2005.
Diffstat (limited to '')
| -rw-r--r-- | openbsd-compat/getrrsetbyname.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c index dc6fe0533..caadceb64 100644 --- a/openbsd-compat/getrrsetbyname.c +++ b/openbsd-compat/getrrsetbyname.c @@ -89,7 +89,7 @@ struct __res_state _res; #ifndef GETSHORT #define GETSHORT(s, cp) { \ - register u_char *t_cp = (u_char *)(cp); \ + u_char *t_cp = (u_char *)(cp); \ (s) = ((u_int16_t)t_cp[0] << 8) \ | ((u_int16_t)t_cp[1]) \ ; \ @@ -99,7 +99,7 @@ struct __res_state _res; #ifndef GETLONG #define GETLONG(l, cp) { \ - register u_char *t_cp = (u_char *)(cp); \ + u_char *t_cp = (u_char *)(cp); \ (l) = ((u_int32_t)t_cp[0] << 24) \ | ((u_int32_t)t_cp[1] << 16) \ | ((u_int32_t)t_cp[2] << 8) \ @@ -115,30 +115,28 @@ struct __res_state _res; #ifndef HAVE__GETSHORT static u_int16_t -_getshort(msgp) - register const u_char *msgp; +_getshort(const u_char *msgp) { - register u_int16_t u; + u_int16_t u; GETSHORT(u, msgp); return (u); } #elif defined(HAVE_DECL__GETSHORT) && (HAVE_DECL__GETSHORT == 0) -u_int16_t _getshort(register const u_char *); +u_int16_t _getshort(const u_char *); #endif #ifndef HAVE__GETLONG static u_int32_t -_getlong(msgp) - register const u_char *msgp; +_getlong(const u_char *msgp) { - register u_int32_t u; + u_int32_t u; GETLONG(u, msgp); return (u); } #elif defined(HAVE_DECL__GETLONG) && (HAVE_DECL__GETLONG == 0) -u_int32_t _getlong(register const u_char *); +u_int32_t _getlong(const u_char *); #endif /* ************** */ |