[GNUnet-SVN] r11805 - in gnunet/src: arm core fs hostlist util

[gnunet]

Author: grothoff
Date: 2010-06-18 16:30:23 +0200 (Fri, 18 Jun 2010)
New Revision: 11805

Modified:
   gnunet/src/arm/gnunet-service-arm_interceptor.c
   gnunet/src/core/gnunet-service-core.c
   gnunet/src/fs/fs_uri.c
   gnunet/src/hostlist/hostlist-server.c
   gnunet/src/util/disk.c
   gnunet/src/util/os_installation.c
   gnunet/src/util/service.c
Log:
code clean up

Modified: gnunet/src/arm/gnunet-service-arm_interceptor.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm_interceptor.c     2010-06-18 14:21:51 UTC 
(rev 11804)
+++ gnunet/src/arm/gnunet-service-arm_interceptor.c     2010-06-18 14:30:23 UTC 
(rev 11805)
@@ -474,14 +474,14 @@
                                BUFFER_SIZE);
   if (fc->service_to_client_bufferDataLength <= 0)
     {
+#if DEBUG_SERVICE_MANAGER
       if (fc->service_to_client_bufferDataLength == 0)
        {
-#if DEBUG_SERVICE_MANAGER
          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                      "Service `%s' stopped sending data.\n",
                      fc->listen_info->serviceName);
+       }
 #endif
-       }
       if (fc->first_write_done != GNUNET_YES)
        {
          fc->service_to_client_bufferDataLength = 0;

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2010-06-18 14:21:51 UTC (rev 
11804)
+++ gnunet/src/core/gnunet-service-core.c       2010-06-18 14:30:23 UTC (rev 
11805)
@@ -3205,7 +3205,9 @@
                  (unsigned int) type,
                  GNUNET_i2s (&sender->peer));
 #endif
-      /* FIXME: stats... */
+      GNUNET_STATISTICS_update (stats,
+                               gettext_noop ("# messages not delivered to any 
client"), 
+                               1, GNUNET_NO);
     }
 }
 

Modified: gnunet/src/fs/fs_uri.c
===================================================================
--- gnunet/src/fs/fs_uri.c      2010-06-18 14:21:51 UTC (rev 11804)
+++ gnunet/src/fs/fs_uri.c      2010-06-18 14:30:23 UTC (rev 11805)
@@ -1756,7 +1756,7 @@
         }
     }
   if (hbits > 0)
-    ret[len++] = tbl[bits & 63];
+    ret[len] = tbl[bits & 63];
   return ret;
 }
 

Modified: gnunet/src/hostlist/hostlist-server.c
===================================================================
--- gnunet/src/hostlist/hostlist-server.c       2010-06-18 14:21:51 UTC (rev 
11804)
+++ gnunet/src/hostlist/hostlist-server.c       2010-06-18 14:30:23 UTC (rev 
11805)
@@ -62,12 +62,12 @@
 /**
  * Handle to the core service (NULL until we've connected to it).
  */
-struct GNUNET_CORE_Handle *core;
+static struct GNUNET_CORE_Handle *core;
 
 /**
  * Handle to the peerinfo notify service (NULL until we've connected to it).
  */
-struct GNUNET_PEERINFO_NotifyContext *notify;
+static struct GNUNET_PEERINFO_NotifyContext *notify;
 
 /**
  * Our primary task for IPv4.

Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c      2010-06-18 14:21:51 UTC (rev 11804)
+++ gnunet/src/util/disk.c      2010-06-18 14:30:23 UTC (rev 11805)
@@ -704,6 +704,8 @@
 
   GNUNET_assert (dirName != NULL);
   dname = GNUNET_STRINGS_filename_expand (dirName);
+  if (dname == NULL)
+    return GNUNET_SYSERR;
   while ((strlen (dname) > 0) && (dname[strlen (dname) - 1] == DIR_SEPARATOR))
     dname[strlen (dname) - 1] = '\0';
   if (0 != STAT (dname, &istat))

Modified: gnunet/src/util/os_installation.c
===================================================================
--- gnunet/src/util/os_installation.c   2010-06-18 14:21:51 UTC (rev 11804)
+++ gnunet/src/util/os_installation.c   2010-06-18 14:30:23 UTC (rev 11805)
@@ -96,11 +96,12 @@
   GNUNET_snprintf (fn, 
                   sizeof(fn), "/proc/%u/exe", getpid ());
   size = readlink (fn, lnk, sizeof (lnk)-1);
-  if ((size == 0) || (size >= sizeof(lnk)-1))
+  if (size <= 0)
     {
       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "readlink", fn);
       return NULL;
     }
+  GNUNET_assert (size < sizeof (lnk));
   lnk[size] = '\0';
   while ((lnk[size] != '/') && (size > 0))
     size--;

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2010-06-18 14:21:51 UTC (rev 11804)
+++ gnunet/src/util/service.c   2010-06-18 14:30:23 UTC (rev 11805)
@@ -732,10 +732,11 @@
          unixpath,
          slen);
   un->sun_path[slen] = '\0';
-  slen += sizeof (sa_family_t);
 #if LINUX
   un->sun_path[0] = '\0';
   slen = sizeof (struct sockaddr_un);
+#else
+  slen += sizeof (sa_family_t);
 #endif
   *saddrs = (struct sockaddr*) un;
   *saddrlens = slen;