[GNUnet-SVN] r24508 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2012-10-24 14:56:06 +0200 (Wed, 24 Oct 2012)
New Revision: 24508

Modified:
   gnunet/src/transport/plugin_transport_http_common.c
Log:
-fix logic

Modified: gnunet/src/transport/plugin_transport_http_common.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_common.c 2012-10-24 12:54:16 UTC 
(rev 24507)
+++ gnunet/src/transport/plugin_transport_http_common.c 2012-10-24 12:56:06 UTC 
(rev 24508)
@@ -51,22 +51,14 @@
                                         asc, void *asc_cls)
 {
   const char *saddr = (const char *) addr;
-  if (NULL == saddr)
+
+  if ( (NULL == saddr) ||
+       (0 >= addrlen) ||
+       ('\0' != saddr[addrlen-1]) )
   {
       asc (asc_cls, NULL);
       return;
   }
-  if (0 >= addrlen)
-  if (NULL == saddr)
-  {
-      asc (asc_cls, NULL);
-      return;
-  }
-  if (saddr[addrlen-1] != '\0')
-  {
-      asc (asc_cls, NULL);
-      return;
-  }
   asc (asc_cls, saddr);
 }