[or-cvs] r18422: {tor} Remove some deadcode and use tor_inet_aton uniformly. (in tor/trunk/src: common or)

[nickm at seul.org]

Author: nickm
Date: 2009-02-08 22:13:05 -0500 (Sun, 08 Feb 2009)
New Revision: 18422

Modified:
   tor/trunk/src/common/compat.c
   tor/trunk/src/or/eventdns.c
Log:
Remove some deadcode and use tor_inet_aton uniformly.

Modified: tor/trunk/src/common/compat.c
===================================================================
--- tor/trunk/src/common/compat.c	2009-02-09 03:13:02 UTC (rev 18421)
+++ tor/trunk/src/common/compat.c	2009-02-09 03:13:05 UTC (rev 18422)
@@ -97,12 +97,6 @@
 #include "strlcat.c"
 #endif
 
-#ifndef INADDR_NONE
-/* This is used by inet_addr, but apparently Solaris doesn't define it
- * anyplace. */
-#define INADDR_NONE ((unsigned long) -1)
-#endif
-
 #ifdef HAVE_SYS_MMAN_H
 /** Try to create a memory mapping for <b>filename</b> and return it.  On
  * failure, return NULL.  Sets errno properly, using ERANGE to mean
@@ -1274,25 +1268,6 @@
   if (d < 0 || d > 255) return 0;
   addr->s_addr = htonl((a<<24) | (b<<16) | (c<<8) | d);
   return 1;
-
-#if 0
-#ifdef HAVE_INET_ATON
-  return inet_aton(c, addr);
-#else
-  uint32_t r;
-  tor_assert(c);
-  tor_assert(addr);
-  if (strcmp(c, "255.255.255.255") == 0) {
-    addr->s_addr = 0xFFFFFFFFu;
-    return 1;
-  }
-  r = inet_addr(c);
-  if (r == INADDR_NONE)
-    return 0;
-  addr->s_addr = r;
-  return 1;
-#endif
-#endif
 }
 
 /** Given <b>af</b>==AF_INET and <b>src</b> a struct in_addr, or

Modified: tor/trunk/src/or/eventdns.c
===================================================================
--- tor/trunk/src/or/eventdns.c	2009-02-09 03:13:02 UTC (rev 18421)
+++ tor/trunk/src/or/eventdns.c	2009-02-09 03:13:05 UTC (rev 18422)
@@ -355,20 +355,7 @@
 {
 	return err == EAGAIN || err == WSAEWOULDBLOCK;
 }
-static int
-inet_aton(const char *c, struct in_addr *addr)
-{
-	uint32_t r;
-	if (strcmp(c, "255.255.255.255") == 0) {
-		addr->s_addr = 0xffffffffu;
-	} else {
-		r = inet_addr(c);
-		if (r == INADDR_NONE)
-			return 0;
-		addr->s_addr = r;
-	}
-	return 1;
-}
+#define inet_aton(c, addr) tor_inet_aton((c), (addr))
 #define CLOSE_SOCKET(x) closesocket(x)
 #else
 #define last_error(sock) (errno)