[GNUnet-SVN] r11806 - in gnunet/src: arm fs util

[gnunet]

Author: grothoff
Date: 2010-06-18 16:47:03 +0200 (Fri, 18 Jun 2010)
New Revision: 11806

Modified:
   gnunet/src/arm/gnunet-arm.c
   gnunet/src/fs/gnunet-publish.c
   gnunet/src/util/connection.c
   gnunet/src/util/os_priority.c
Log:
code clean up

Modified: gnunet/src/arm/gnunet-arm.c
===================================================================
--- gnunet/src/arm/gnunet-arm.c 2010-06-18 14:30:23 UTC (rev 11805)
+++ gnunet/src/arm/gnunet-arm.c 2010-06-18 14:47:03 UTC (rev 11806)
@@ -235,10 +235,13 @@
   cfg = c;
   config_file = cfgfile;
   if (GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "SERVICEHOME", &dir) 
!= GNUNET_OK)
-  {
-    dir = NULL;
-  }
-
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 _("Fatal configuration error: `%s' option in section `%s' 
missing.\n"),
+                 "SERVICEHOME",
+                 "PATHS");
+      return;
+    }
   h = GNUNET_ARM_connect (cfg, sched, NULL);
   if (h == NULL)
     {

Modified: gnunet/src/fs/gnunet-publish.c
===================================================================
--- gnunet/src/fs/gnunet-publish.c      2010-06-18 14:30:23 UTC (rev 11805)
+++ gnunet/src/fs/gnunet-publish.c      2010-06-18 14:47:03 UTC (rev 11806)
@@ -395,6 +395,12 @@
   
   sched = s;
   /* check arguments */
+  if ((uri_string != NULL) && (extract_only))
+    {
+      printf (_("Cannot extract metadata from a URI!\n"));
+      ret = -1;
+      return;
+    }
   if ( ( (uri_string == NULL) || (extract_only) ) 
        && ( (args[0] == NULL) || (args[1] != NULL) ) )
     {
@@ -409,12 +415,6 @@
       ret = -1;
       return;
     }
-  if ((uri_string != NULL) && (extract_only))
-    {
-      printf (_("Cannot extract metadata from a URI!\n"));
-      ret = -1;
-      return;
-    }
   if (pseudonym != NULL)
     {
       if (NULL == this_id)
@@ -445,14 +445,6 @@
          return;
         }
     }
-  if ( (args[0] == NULL) &&
-       (uri_string == NULL) )
-    {
-      fprintf (stderr,
-              _("Need the name of a file to publish!\n"));
-      ret = 1;
-      return;
-    }
   cfg = c;
   ctx = GNUNET_FS_start (sched,
                         cfg,

Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c        2010-06-18 14:30:23 UTC (rev 11805)
+++ gnunet/src/util/connection.c        2010-06-18 14:47:03 UTC (rev 11806)
@@ -529,11 +529,6 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
              "Destroy actually runs (%p)!\n", sock);
 #endif
-  if (sock->dns_active != NULL)
-    {
-      GNUNET_RESOLVER_request_cancel (sock->dns_active);
-      sock->dns_active = NULL;
-    }
   while (NULL != (pos = sock->ap_head))
     {
       GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (pos->sock));

Modified: gnunet/src/util/os_priority.c
===================================================================
--- gnunet/src/util/os_priority.c       2010-06-18 14:30:23 UTC (rev 11805)
+++ gnunet/src/util/os_priority.c       2010-06-18 14:47:03 UTC (rev 11806)
@@ -61,7 +61,7 @@
 GNUNET_OS_set_process_priority (pid_t proc,
                                 enum GNUNET_SCHEDULER_Priority prio)
 {
-  int rprio = 0;
+  int rprio;
 
   GNUNET_assert (prio < GNUNET_SCHEDULER_PRIORITY_COUNT);
   if (prio == GNUNET_SCHEDULER_PRIORITY_KEEP)