From 16a890a29ca768953fc3ddea0977fe013564201b Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Wed, 25 Nov 2009 08:28:35 -0800
Subject: [PATCH] revert merged patches

---
 lib/roken/getarg.c       | 5 ++---
 lib/roken/roken-common.h | 5 -----
 lib/roken/snprintf.c     | 4 ----
 lib/roken/socket.c       | 4 ++--
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/lib/roken/getarg.c b/lib/roken/getarg.c
index eac46e8f0..d182f0019 100644
--- a/lib/roken/getarg.c
+++ b/lib/roken/getarg.c
@@ -286,7 +286,6 @@ arg_printusage_i18n (struct getargs *args,
 	}
 	if (args[i].short_name && !ISFLAG(args[i])) {
 	    snprintf(buf, sizeof(buf), "[-%c", args[i].short_name);
-	    buf[sizeof(buf)/sizeof(buf[0]) - 1] = '\0';
 	    len += 2;
 	    len += print_arg(buf + strlen(buf), sizeof(buf) - strlen(buf),
 			     0, 0, &args[i], i18n);
@@ -353,7 +352,7 @@ static int
 arg_match_long(struct getargs *args, size_t num_args,
 	       char *argv, int argc, char **rargv, int *goptind)
 {
-    size_t i;
+    int i;
     char *goptarg = NULL;
     int negate = 0;
     int partial_match = 0;
@@ -485,7 +484,7 @@ static int
 arg_match_short (struct getargs *args, size_t num_args,
 		 char *argv, int argc, char **rargv, int *goptind)
 {
-    size_t j, k;
+    int j, k;
 
     for(j = 1; j > 0 && j < strlen(rargv[*goptind]); j++) {
 	for(k = 0; k < num_args; k++) {
diff --git a/lib/roken/roken-common.h b/lib/roken/roken-common.h
index bdaedfa84..ac7a92d15 100644
--- a/lib/roken/roken-common.h
+++ b/lib/roken/roken-common.h
@@ -252,11 +252,6 @@
 #define INET6_ADDRSTRLEN   46
 #endif
 
-/*
- * error codes for inet_ntop/inet_pton 
- */
-#define EAFNOSUPPORT WSAEAFNOSUPPORT
-
 /*
  * for shutdown(2)
  */
diff --git a/lib/roken/snprintf.c b/lib/roken/snprintf.c
index 51dca3c9d..a20054672 100644
--- a/lib/roken/snprintf.c
+++ b/lib/roken/snprintf.c
@@ -40,10 +40,6 @@
 #include "roken.h"
 #include <assert.h>
 
-#if defined(TEST_SNPRINTF)
-#include "snprintf-test.h"
-#endif /* TEST_SNPRINTF */
-
 enum format_flags {
     minus_flag     =  1,
     plus_flag      =  2,
diff --git a/lib/roken/socket.c b/lib/roken/socket.c
index fdf090d52..bfc4b7102 100644
--- a/lib/roken/socket.c
+++ b/lib/roken/socket.c
@@ -253,7 +253,7 @@ socket_set_debug (rk_socket_t sock)
 #if defined(SO_DEBUG) && defined(HAVE_SETSOCKOPT)
     int on = 1;
 
-    if (setsockopt (sock, SOL_rk_socket_t, SO_DEBUG, (void *) &on, sizeof (on)) < 0)
+    if (setsockopt (sock, SOL_SOCKET, SO_DEBUG, (void *) &on, sizeof (on)) < 0)
 	warn ("setsockopt SO_DEBUG (ignored)");
 #endif
 }
@@ -280,7 +280,7 @@ ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
 socket_set_reuseaddr (rk_socket_t sock, int val)
 {
 #if defined(SO_REUSEADDR) && defined(HAVE_SETSOCKOPT)
-    if(setsockopt(sock, SOL_rk_socket_t, SO_REUSEADDR, (void *)&val,
+    if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&val,
 		  sizeof(val)) < 0)
 	err (1, "setsockopt SO_REUSEADDR");
 #endif