[GNUnet-SVN] r11680 - in gnunet/src: hostlist include peerinfo testing util

[gnunet]

Author: grothoff
Date: 2010-06-12 00:33:24 +0200 (Sat, 12 Jun 2010)
New Revision: 11680

Modified:
   gnunet/src/hostlist/hostlist-server.c
   gnunet/src/include/platform.h
   gnunet/src/peerinfo/gnunet-service-peerinfo.c
   gnunet/src/testing/testing_group.c
   gnunet/src/util/strings.c
Log:
minor fixes

Modified: gnunet/src/hostlist/hostlist-server.c
===================================================================
--- gnunet/src/hostlist/hostlist-server.c       2010-06-11 22:01:30 UTC (rev 
11679)
+++ gnunet/src/hostlist/hostlist-server.c       2010-06-11 22:33:24 UTC (rev 
11680)
@@ -597,11 +597,19 @@
                  _("Could not access PEERINFO service.  Exiting.\n"));     
       return GNUNET_SYSERR;
     }
-  if (-1 == GNUNET_CONFIGURATION_get_value_number (cfg,
-                                                  "HOSTLIST",
-                                                  "HTTPPORT", 
-                                                  &port))
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+                                                         "HOSTLIST",
+                                                         "HTTPPORT", 
+                                                         &port))
     return GNUNET_SYSERR;
+  if ( (port == 0) ||
+       (port > UINT16_MAX) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 _("Invalid port number %llu.  Exiting.\n"),
+                 port);            
+      return GNUNET_SYSERR;
+    }
 
   if ( GNUNET_SYSERR  == GNUNET_CONFIGURATION_get_value_string (cfg,
                                                    "HOSTLIST",

Modified: gnunet/src/include/platform.h
===================================================================
--- gnunet/src/include/platform.h       2010-06-11 22:01:30 UTC (rev 11679)
+++ gnunet/src/include/platform.h       2010-06-11 22:33:24 UTC (rev 11680)
@@ -214,6 +214,10 @@
 #include "langinfo.h"
 #endif
 
+#ifndef SIZE_MAX
+#define SIZE_MAX ((size_t)(-1))
+#endif
+
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0
 #endif

Modified: gnunet/src/peerinfo/gnunet-service-peerinfo.c
===================================================================
--- gnunet/src/peerinfo/gnunet-service-peerinfo.c       2010-06-11 22:01:30 UTC 
(rev 11679)
+++ gnunet/src/peerinfo/gnunet-service-peerinfo.c       2010-06-11 22:33:24 UTC 
(rev 11680)
@@ -329,8 +329,8 @@
     {
       if (host->trust + value < host->trust)
         {
-          value = ((uint32_t) - 1) - host->trust;
-          host->trust = (uint32_t) - 1; /* maximized */
+          value = UINT32_MAX - host->trust;
+          host->trust = UINT32_MAX;
         }
       else
         host->trust += value;

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2010-06-11 22:01:30 UTC (rev 11679)
+++ gnunet/src/testing/testing_group.c  2010-06-11 22:33:24 UTC (rev 11680)
@@ -1488,7 +1488,7 @@
         }
       }
 
-      GNUNET_free_non_null(temp_transports);
+      GNUNET_free (temp_transports);
       fclose(temp_file_handle);
 
       if (GNUNET_OK !=

Modified: gnunet/src/util/strings.c
===================================================================
--- gnunet/src/util/strings.c   2010-06-11 22:01:30 UTC (rev 11679)
+++ gnunet/src/util/strings.c   2010-06-11 22:33:24 UTC (rev 11680)
@@ -204,7 +204,7 @@
 #else
              (char **) &input,
 #endif
-             &len, &itmp, &finSize) == (size_t) - 1)
+             &len, &itmp, &finSize) == SIZE_MAX)
     {
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "iconv");
       iconv_close (cd);