[openssh-commits] [openssh] 02/02: ANSIfy getshort and getlong.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 1b2920e3b63db2eddebeec7330ffe8b723055573
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Fri Feb 25 13:50:56 2022 +1100

    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.
---
 openbsd-compat/getrrsetbyname.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index dc6fe053..caadceb6 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
 
 /* ************** */

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.