oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

revert merged patches

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-11-25 08:28:35 -08:00
parent c8fc15de86
commit 16a890a29c
4 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/roken/getarg.c
View File

@@ -286,7 +286,6 @@ arg_printusage_i18n (struct getargs *args,
} }
if (args[i].short_name && !ISFLAG(args[i])) { if (args[i].short_name && !ISFLAG(args[i])) {
snprintf(buf, sizeof(buf), "[-%c", args[i].short_name); snprintf(buf, sizeof(buf), "[-%c", args[i].short_name);
buf[sizeof(buf)/sizeof(buf[0]) - 1] = '\0';
len += 2; len += 2;
len += print_arg(buf + strlen(buf), sizeof(buf) - strlen(buf), len += print_arg(buf + strlen(buf), sizeof(buf) - strlen(buf),
0, 0, &args[i], i18n); 0, 0, &args[i], i18n);
@@ -353,7 +352,7 @@ static int
arg_match_long(struct getargs *args, size_t num_args, arg_match_long(struct getargs *args, size_t num_args,
char *argv, int argc, char **rargv, int *goptind) char *argv, int argc, char **rargv, int *goptind)
{ {
size_t i; int i;
char *goptarg = NULL; char *goptarg = NULL;
int negate = 0; int negate = 0;
int partial_match = 0; int partial_match = 0;
@@ -485,7 +484,7 @@ static int
arg_match_short (struct getargs *args, size_t num_args, arg_match_short (struct getargs *args, size_t num_args,
char *argv, int argc, char **rargv, int *goptind) 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(j = 1; j > 0 && j < strlen(rargv[*goptind]); j++) {
for(k = 0; k < num_args; k++) { for(k = 0; k < num_args; k++) {

5
lib/roken/roken-common.h
View File

@@ -252,11 +252,6 @@
#define INET6_ADDRSTRLEN 46 #define INET6_ADDRSTRLEN 46
#endif #endif
/*
* error codes for inet_ntop/inet_pton
*/
#define EAFNOSUPPORT WSAEAFNOSUPPORT
/* /*
* for shutdown(2) * for shutdown(2)
*/ */

4
lib/roken/snprintf.c
View File

@@ -40,10 +40,6 @@
#include "roken.h" #include "roken.h"
#include <assert.h> #include <assert.h>
#if defined(TEST_SNPRINTF)
#include "snprintf-test.h"
#endif /* TEST_SNPRINTF */
enum format_flags { enum format_flags {
minus_flag = 1, minus_flag = 1,
plus_flag = 2, plus_flag = 2,

4
lib/roken/socket.c
View File

@@ -253,7 +253,7 @@ socket_set_debug (rk_socket_t sock)
#if defined(SO_DEBUG) && defined(HAVE_SETSOCKOPT) #if defined(SO_DEBUG) && defined(HAVE_SETSOCKOPT)
int on = 1; 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)"); warn ("setsockopt SO_DEBUG (ignored)");
#endif #endif
} }
@@ -280,7 +280,7 @@ ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
socket_set_reuseaddr (rk_socket_t sock, int val) socket_set_reuseaddr (rk_socket_t sock, int val)
{ {
#if defined(SO_REUSEADDR) && defined(HAVE_SETSOCKOPT) #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) sizeof(val)) < 0)
err (1, "setsockopt SO_REUSEADDR"); err (1, "setsockopt SO_REUSEADDR");
#endif #endif