de-register, remove #ifdefs and #ifndefs using SIN6_LEN, add OpenBSD cvs

markers.

no binary changes

11 files changed, 74 insertions, 82 deletions

diff --git a/usr.sbin/httpd/src/ap/ap_base64.c b/usr.sbin/httpd/src/ap/ap_base64.c
index fce8edfb7fb..0c36a7a9048 100644
--- a/usr.sbin/httpd/src/ap/ap_base64.c
+++ b/usr.sbin/httpd/src/ap/ap_base64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ap_base64.c,v 1.8 2005/03/28 21:03:33 niallo Exp $ */
+/* $OpenBSD: ap_base64.c,v 1.9 2008/05/25 11:46:27 mbalmer Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -96,8 +96,8 @@ API_EXPORT(int)
 ap_base64decode_len(const char *bufcoded)
 {
 	int nbytesdecoded;
-	register const unsigned char *bufin;
-	register int nprbytes;
+	const unsigned char *bufin;
+	int nprbytes;
 
 	bufin = (const unsigned char *) bufcoded;
 	while (pr2six[*(bufin++)] <= 63);
@@ -125,9 +125,9 @@ API_EXPORT(int)
 ap_base64decode_binary(unsigned char *bufplain, const char *bufcoded)
 {
 	int nbytesdecoded;
-	register const unsigned char *bufin;
-	register unsigned char *bufout;
-	register int nprbytes;
+	const unsigned char *bufin;
+	unsigned char *bufout;
+	int nprbytes;
 	bufin = (const unsigned char *) bufcoded;
 	while (pr2six[*(bufin++)] <= 63);
 	nprbytes = (bufin - (const unsigned char *) bufcoded) - 1;
diff --git a/usr.sbin/httpd/src/ap/ap_snprintf.c b/usr.sbin/httpd/src/ap/ap_snprintf.c
index cb20e7f9cb5..aad2a402838 100644
--- a/usr.sbin/httpd/src/ap/ap_snprintf.c
+++ b/usr.sbin/httpd/src/ap/ap_snprintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ap_snprintf.c,v 1.16 2007/02/03 18:01:52 espie Exp $ */
+/* $OpenBSD: ap_snprintf.c,v 1.17 2008/05/25 11:46:27 mbalmer Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -125,9 +125,9 @@ typedef int bool_int;
 static char *
 ap_cvt(double arg, int ndigits, int *decpt, int *sign, int eflag, char *buf)
 {
-	register int r2;
+	int r2;
 	double fi, fj;
-	register char *p, *p1;
+	char *p, *p1;
 
 	if (ndigits >= NDIG - 1)
 		ndigits = NDIG - 2;
@@ -217,8 +217,8 @@ static char
 *ap_gcvt(double number, int ndigit, char *buf, boolean_e altform)
 {
 	int sign, decpt;
-	register char *p1, *p2;
-	register int i;
+	char *p1, *p2;
+	int i;
 	char buf1[NDIG];
 
 	p1 = ap_ecvt(number, ndigit, &decpt, &sign, buf1);
@@ -362,11 +362,11 @@ static char
  * latter is faster.
  */
 static char *
-conv_10(register wide_int num, register bool_int is_unsigned,
-    register bool_int *is_negative, char *buf_end, register int *len)
+conv_10(wide_int num, bool_int is_unsigned,
+    bool_int *is_negative, char *buf_end, int *len)
 {
-	register char *p = buf_end;
-	register u_wide_int magnitude;
+	char *p = buf_end;
+	u_wide_int magnitude;
 
 	if (is_unsigned) {
 		magnitude = (u_wide_int) num;
@@ -398,7 +398,7 @@ conv_10(register wide_int num, register bool_int is_unsigned,
 	* We use a do-while loop so that we write at least 1 digit 
 	*/
 	do {
-		register u_wide_int new_magnitude = magnitude / 10;
+		u_wide_int new_magnitude = magnitude / 10;
 
 		*--p = (char) (magnitude - new_magnitude * 10 + '0');
 		magnitude = new_magnitude;
@@ -410,10 +410,10 @@ conv_10(register wide_int num, register bool_int is_unsigned,
 }
 
 static char *
-conv_10_quad(widest_int num, register bool_int is_unsigned,
-    register bool_int *is_negative, char *buf_end, register int *len)
+conv_10_quad(widest_int num, bool_int is_unsigned,
+    bool_int *is_negative, char *buf_end, int *len)
 {
-	register char *p = buf_end;
+	char *p = buf_end;
 	u_widest_int magnitude;
 
 	/*
@@ -515,11 +515,11 @@ conv_sockaddr_in(struct sockaddr_in *si, char *buf_end, int *len)
  * in buf).
  */
 static char *
-conv_fp(register char format, register double num, boolean_e add_dp,
+conv_fp(char format, double num, boolean_e add_dp,
     int precision, bool_int *is_negative, char *buf, int *len, int buflen)
 {
-	register char *s = buf;
-	register char *p;
+	char *s = buf;
+	char *p;
 	int decimal_point;
 	char buf1[NDIG];
 
@@ -614,14 +614,14 @@ conv_fp(register char format, register double num, boolean_e add_dp,
  * the number isn't quad size.
  */
 static char *
-conv_p2(register u_wide_int num, register int nbits, char format, char *buf_end,
-    register int *len)
+conv_p2(u_wide_int num, int nbits, char format, char *buf_end,
+    int *len)
 {
-	register int mask = (1 << nbits) - 1;
-	register char *p = buf_end;
+	int mask = (1 << nbits) - 1;
+	char *p = buf_end;
 	static const char low_digits[] = "0123456789abcdef";
 	static const char upper_digits[] = "0123456789ABCDEF";
-	register const char *digits = (format == 'X') ? upper_digits :
+	const char *digits = (format == 'X') ? upper_digits :
 	    low_digits;
 
 	do {
@@ -635,14 +635,14 @@ conv_p2(register u_wide_int num, register int nbits, char format, char *buf_end,
 }
 
 static char *
-conv_p2_quad(u_widest_int num, register int nbits, char format,
-    char *buf_end, register int *len)
+conv_p2_quad(u_widest_int num, int nbits, char format,
+    char *buf_end, int *len)
 {
-	register int mask = (1 << nbits) - 1;
-	register char *p = buf_end;
+	int mask = (1 << nbits) - 1;
+	char *p = buf_end;
 	static const char low_digits[] = "0123456789abcdef";
 	static const char upper_digits[] = "0123456789ABCDEF";
-	register const char *digits = (format == 'X') ? upper_digits :
+	const char *digits = (format == 'X') ? upper_digits :
 	    low_digits;
 
 	if (num <= ULONG_MAX)
@@ -666,16 +666,16 @@ API_EXPORT(int)
 ap_vformatter(int (*flush_func)(ap_vformatter_buff *),
     ap_vformatter_buff *vbuff, const char *fmt, va_list ap)
 {
-	register char *sp;
-	register char *bep;
-	register int cc = 0;
-	register int i;
+	char *sp;
+	char *bep;
+	int cc = 0;
+	int i;
 
-	register char *s = NULL;
+	char *s = NULL;
 	char *q;
 	int s_len;
 
-	register int min_width = 0;
+	int min_width = 0;
 	int precision = 0;
 	enum {
 	LEFT, RIGHT
diff --git a/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c b/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c
index 66ad0e55a5e..0115ec15208 100644
--- a/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c
+++ b/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: mod_auth_digest.c,v 1.22 2008/05/25 11:46:27 mbalmer Exp $ */
+
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -1316,7 +1318,7 @@ static int digest_check_auth(request_rec *r)
     const char *user = r->connection->user;
     int m = r->method_number;
     int method_restricted = 0;
-    register int x;
+    int x;
     const char *t, *w;
     table *grpstatus;
     const array_header *reqs_arr;
diff --git a/usr.sbin/httpd/src/modules/proxy/proxy_ftp.c b/usr.sbin/httpd/src/modules/proxy/proxy_ftp.c
index 9c5d6b4ca01..2a8a485e92c 100644
--- a/usr.sbin/httpd/src/modules/proxy/proxy_ftp.c
+++ b/usr.sbin/httpd/src/modules/proxy/proxy_ftp.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: proxy_ftp.c,v 1.16 2008/05/25 11:46:27 mbalmer Exp $ */
+
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -270,7 +272,7 @@ static long int send_dir(BUFF *data, request_rec *r, cache_req *c, char *cwd)
     char *searchptr = NULL;
     int firstfile = 1;
     unsigned long total_bytes_sent = 0;
-    register int n;
+    int n;
     conn_rec *con = r->connection;
     pool *p = r->pool;
     char *dir, *path, *reldir, *site, *type = NULL;
@@ -1018,9 +1020,7 @@ lpsvagain:
                          h3, h2, h1, h0, pport);
             sin = (struct sockaddr_in *)&data_addr;
             sin->sin_family = AF_INET;
-#ifdef SIN6_LEN
             sin->sin_len = sizeof(*sin);
-#endif
             sin->sin_addr.s_addr = htonl(paddr);
             sin->sin_port = htons(pport);
             i = ap_proxy_doconnect(dsock, (struct sockaddr *)&data_addr, r);
@@ -1043,9 +1043,7 @@ lpsvagain:
 	    int i;
 	    sin6 = (struct sockaddr_in6 *)&data_addr;
 	    sin6->sin6_family = AF_INET6;
-#ifdef SIN6_LEN
 	    sin6->sin6_len = sizeof(*sin6);
-#endif
 	    for (i = 0; i < 16; i++)
 		sin6->sin6_addr.s6_addr[i] = ho[i] & 0xff;
 	    sin6->sin6_port = htons(((po[0] & 0xff) << 8) | (po[1] & 0xff));
@@ -1063,11 +1061,7 @@ lpsvagain:
 		&& pstr[0] == pstr[1] && pstr[0] == pstr[2]
 		&& pstr[0] == pstr[strlen(pstr) - 1]) {
 	    /* expect "|||port|" */
-#ifndef SIN6_LEN
-	    memcpy(&data_addr, &server, SA_LEN((struct sockaddr *)&server));
-#else
 	    memcpy(&data_addr, &server, server.ss_len);
-#endif
 	    switch (data_addr.ss_family) {
 	    case AF_INET:
 		sin = (struct sockaddr_in *)&data_addr;
@@ -1120,20 +1114,12 @@ lpsvagain:
                                   "proxy: error setting reuseaddr option"));
         }
 
-#ifndef SIN6_LEN
-	if (bind(dsock, (struct sockaddr *) &server, SA_LEN((struct sockaddr *)&server)) == -1)
-#else
 	if (bind(dsock, (struct sockaddr *) &server, server.ss_len) == -1)
-#endif
 	{
 	    char hostnamebuf[MAXHOSTNAMELEN], portnamebuf[MAXHOSTNAMELEN];
 
 	    getnameinfo((struct sockaddr *)&server,
-#ifndef SIN6_LEN
-		    SA_LEN((struct sockaddr *)&server),
-#else
 		    server.ss_len,
-#endif
 		hostnamebuf, sizeof(hostnamebuf),
 		portnamebuf, sizeof(portnamebuf),
 		NI_NUMERICHOST | NI_NUMERICSERV);
diff --git a/usr.sbin/httpd/src/modules/standard/mod_auth.c b/usr.sbin/httpd/src/modules/standard/mod_auth.c
index b1d2899ed43..8253a10245b 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_auth.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_auth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_auth.c,v 1.12 2004/12/02 19:42:47 henning Exp $ */
+/*	$OpenBSD: mod_auth.c,v 1.13 2008/05/25 11:46:27 mbalmer Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -246,7 +246,7 @@ static int check_user_access(request_rec *r)
     char *user = r->connection->user;
     int m = r->method_number;
     int method_restricted = 0;
-    register int x;
+    int x;
     const char *t, *w;
     table *grpstatus;
     const array_header *reqs_arr = ap_requires(r);
diff --git a/usr.sbin/httpd/src/modules/standard/mod_auth_db.c b/usr.sbin/httpd/src/modules/standard/mod_auth_db.c
index 666a0fb374e..b1b68a6b897 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_auth_db.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_auth_db.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_auth_db.c,v 1.12 2003/08/21 13:11:36 henning Exp $ */
+/*	$OpenBSD: mod_auth_db.c,v 1.13 2008/05/25 11:46:27 mbalmer Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -289,7 +289,7 @@ static int db_check_auth(request_rec *r)
     const array_header *reqs_arr = ap_requires(r);
     require_line *reqs = reqs_arr ? (require_line *) reqs_arr->elts : NULL;
 
-    register int x;
+    int x;
     const char *t;
     char *w;
 
diff --git a/usr.sbin/httpd/src/modules/standard/mod_auth_dbm.c b/usr.sbin/httpd/src/modules/standard/mod_auth_dbm.c
index 2f85f8e442d..4cb355c0484 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_auth_dbm.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_auth_dbm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_auth_dbm.c,v 1.13 2005/02/09 12:13:10 henning Exp $ */
+/*	$OpenBSD: mod_auth_dbm.c,v 1.14 2008/05/25 11:46:27 mbalmer Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -255,7 +255,7 @@ static int dbm_check_auth(request_rec *r)
     const array_header *reqs_arr = ap_requires(r);
     require_line *reqs = reqs_arr ? (require_line *) reqs_arr->elts : NULL;
 
-    register int x;
+    int x;
     const char *t;
     char *w;
 
diff --git a/usr.sbin/httpd/src/modules/standard/mod_autoindex.c b/usr.sbin/httpd/src/modules/standard/mod_autoindex.c
index ab0932f1830..1c7a976650a 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_autoindex.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_autoindex.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: mod_autoindex.c,v 1.13 2008/05/25 11:46:27 mbalmer Exp $ */
+
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -1304,7 +1306,7 @@ static char *terminate_description(autoindex_config_rec *d, char *desc,
 				   int autoindex_opts, int desc_width)
 {
     int maxsize = desc_width;
-    register int x;
+    int x;
 
     /*
      * If there's no DescriptionWidth in effect, default to the old
diff --git a/usr.sbin/httpd/src/modules/standard/mod_digest.c b/usr.sbin/httpd/src/modules/standard/mod_digest.c
index edc509ebd66..d684bd838d8 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_digest.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_digest.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: mod_digest.c,v 1.11 2008/05/25 11:46:27 mbalmer Exp $ */
+
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -404,7 +406,7 @@ static int digest_check_auth(request_rec *r)
     char *user = r->connection->user;
     int m = r->method_number;
     int method_restricted = 0;
-    register int x;
+     int x;
     const char *t;
     char *w;
     const array_header *reqs_arr;
diff --git a/usr.sbin/httpd/src/modules/standard/mod_mime_magic.c b/usr.sbin/httpd/src/modules/standard/mod_mime_magic.c
index 2bf532d3b3d..53cd5874007 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_mime_magic.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_mime_magic.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD */
+
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -1289,13 +1291,13 @@ static int getvalue(server_rec *s, struct magic *m, char **p)
  * space or tab. Copy the converted version to "p", returning its length in
  * *slen. Return updated scan pointer as function result.
  */
-static char *getstr(server_rec *serv, register char *s, register char *p,
+static char *getstr(server_rec *serv, char *s, char *p,
 		    int plen, int *slen)
 {
     char *origs = s, *origp = p;
     char *pmax = p + plen - 1;
-    register int c;
-    register int val;
+    int c;
+    int val;
 
     while ((c = *s++) != '\0') {
 	if (ap_isspace((unsigned char) c))
@@ -1802,8 +1804,8 @@ static int mget(request_rec *r, union VALUETYPE *p, unsigned char *s,
 
 static int mcheck(request_rec *r, union VALUETYPE *p, struct magic *m)
 {
-    register unsigned long l = m->value.l;
-    register unsigned long v;
+    unsigned long l = m->value.l;
+    unsigned long v;
     int matched;
 
     if ((m->value.s[0] == 'x') && (m->value.s[1] == '\0')) {
@@ -1841,9 +1843,9 @@ static int mcheck(request_rec *r, union VALUETYPE *p, struct magic *m)
 	 */
 	v = 0;
 	{
-	    register unsigned char *a = (unsigned char *) m->value.s;
-	    register unsigned char *b = (unsigned char *) p->s;
-	    register int len = m->vallen;
+	    unsigned char *a = (unsigned char *) m->value.s;
+	    unsigned char *b = (unsigned char *) p->s;
+	    int len = m->vallen;
 
 	    while (--len >= 0)
 		if ((v = *b++ - *a++) != 0)
@@ -1955,7 +1957,7 @@ static int ascmagic(request_rec *r, unsigned char *buf, int nbytes)
     unsigned char *s;
     char nbuf[HOWMANY + 1];	/* one extra for terminating '\0' */
     char *token;
-    register struct names *p;
+    struct names *p;
     int small_nbytes;
 
     /* these are easy, do them first */
@@ -2177,10 +2179,10 @@ static int uncompress(request_rec *r, int method,
 
 static int is_tar(unsigned char *buf, int nbytes)
 {
-    register union record *header = (union record *) buf;
-    register int i;
-    register long sum, recsum;
-    register char *p;
+    union record *header = (union record *) buf;
+    int i;
+    long sum, recsum;
+    char *p;
 
     if (nbytes < sizeof(union record))
 	       return 0;
@@ -2218,7 +2220,7 @@ static int is_tar(unsigned char *buf, int nbytes)
  */
 static long from_oct(int digs, char *where)
 {
-    register long value;
+    long value;
 
     while (ap_isspace(*where)) {	/* Skip spaces */
 	where++;
diff --git a/usr.sbin/httpd/src/modules/standard/mod_unique_id.c b/usr.sbin/httpd/src/modules/standard/mod_unique_id.c
index b13723a4f2a..0aabba8ff3d 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_unique_id.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_unique_id.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD */
+
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -240,11 +242,7 @@ static void unique_id_global_init(server_rec *s, pool *p)
     }
 
     getnameinfo((struct sockaddr *)&global_addr,
-#ifndef SIN6_LEN
-	SA_LEN((struct sockaddr *)&global_addr),
-#else
 	global_addr.ss_len,
-#endif
 	str, sizeof(str), NULL, 0, NI_NUMERICHOST);
     ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, s,
                  "mod_unique_id: using ip addr %s", str);