code clean up

7 files changed, 14 insertions, 8 deletions

diff --git a/src/arm/gnunet-service-arm_interceptor.c b/src/arm/gnunet-service-arm_interceptor.c
index afefe4e48..9380a8deb 100644
--- a/src/arm/gnunet-service-arm_interceptor.c
+++ b/src/arm/gnunet-service-arm_interceptor.c
@@ -474,14 +474,14 @@ receiveFromService (void *cls,
                                 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
         }
+#endif
       if (fc->first_write_done != GNUNET_YES)
         {
           fc->service_to_client_bufferDataLength = 0;
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 7a2111e0e..34b3511a8 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -3205,7 +3205,9 @@ deliver_message (struct Neighbour *sender,
                   (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);
     }
 }
 
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 2e1ec92c8..f2c291784 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -1756,7 +1756,7 @@ bin2enc (const void *data, size_t size)
         }
     }
   if (hbits > 0)
-    ret[len++] = tbl[bits & 63];
+    ret[len] = tbl[bits & 63];
   return ret;
 }
 
diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c
index 8d4d38d09..5d8a07ef2 100644
--- a/src/hostlist/hostlist-server.c
+++ b/src/hostlist/hostlist-server.c
@@ -62,12 +62,12 @@ static struct GNUNET_STATISTICS_Handle *stats;
 /**
  * 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.
diff --git a/src/util/disk.c b/src/util/disk.c
index bcede53e4..94615f198 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -704,6 +704,8 @@ GNUNET_DISK_directory_scan (const char *dirName,
 
   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))
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index c61028187..19469e81e 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -96,11 +96,12 @@ get_path_from_proc_exe ()
   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--;
diff --git a/src/util/service.c b/src/util/service.c
index a4316768d..cd27380ee 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -732,10 +732,11 @@ add_unixpath (struct sockaddr **saddrs,
           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;