removed some harmless compiler warnings

[radsecproxy.git] / util.c

diff --git a/util.c b/util.c
index 0a811a8..d551cf0 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Stig Venaas <venaas@uninett.no>
+ * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -50,7 +50,7 @@ void err(char *format, ...) {
 }
 #endif
 
-char *stringcopy(char *s, int len) {
+char *stringcopy(const char *s, int len) {
     char *r;
     if (!len)
        len = strlen(s);
@@ -88,17 +88,19 @@ char *addr2string(struct sockaddr *addr, socklen_t len) {
            addr = (struct sockaddr *)&sa4;
        }
     }
+    len = addr->sa_family == AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6);
+    
     if (getnameinfo(addr, len, addr_buf[i], sizeof(addr_buf[i]),
                     NULL, 0, NI_NUMERICHOST)) {
         debug(DBG_WARN, "getnameinfo failed");
-        return NULL;
+        return "getnameinfo_failed";
     }
     return addr_buf[i];
 }
 
 int connectport(int type, char *host, char *port) {
     struct addrinfo hints, *res0, *res;
-    int s;
+    int s = -1;
     
     memset(&hints, 0, sizeof(hints));
     hints.ai_socktype = type;