code clean up

1 files changed, 6 insertions, 14 deletions

diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index 18c4fd78e..c8c486bd7 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -395,6 +395,12 @@ run (void *cls,
   
   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 @@ run (void *cls,
       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 @@ run (void *cls,
           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,