diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-06-18 14:47:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-06-18 14:47:03 +0000 |
commit | 2be168f3924a38f2d4f9071ccf53e6a032e9087d (patch) | |
tree | 3a08e36cc944a2f8b63d40e9b893e3aee18dcf1a /src/fs/gnunet-publish.c | |
parent | 0ea8e006d5f5ef84e31e000607bd24a23f8fc1ed (diff) | |
download | gnunet-2be168f3924a38f2d4f9071ccf53e6a032e9087d.tar.gz gnunet-2be168f3924a38f2d4f9071ccf53e6a032e9087d.zip |
code clean up
Diffstat (limited to 'src/fs/gnunet-publish.c')
-rw-r--r-- | src/fs/gnunet-publish.c | 20 |
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, | |||
395 | 395 | ||
396 | sched = s; | 396 | sched = s; |
397 | /* check arguments */ | 397 | /* check arguments */ |
398 | if ((uri_string != NULL) && (extract_only)) | ||
399 | { | ||
400 | printf (_("Cannot extract metadata from a URI!\n")); | ||
401 | ret = -1; | ||
402 | return; | ||
403 | } | ||
398 | if ( ( (uri_string == NULL) || (extract_only) ) | 404 | if ( ( (uri_string == NULL) || (extract_only) ) |
399 | && ( (args[0] == NULL) || (args[1] != NULL) ) ) | 405 | && ( (args[0] == NULL) || (args[1] != NULL) ) ) |
400 | { | 406 | { |
@@ -409,12 +415,6 @@ run (void *cls, | |||
409 | ret = -1; | 415 | ret = -1; |
410 | return; | 416 | return; |
411 | } | 417 | } |
412 | if ((uri_string != NULL) && (extract_only)) | ||
413 | { | ||
414 | printf (_("Cannot extract metadata from a URI!\n")); | ||
415 | ret = -1; | ||
416 | return; | ||
417 | } | ||
418 | if (pseudonym != NULL) | 418 | if (pseudonym != NULL) |
419 | { | 419 | { |
420 | if (NULL == this_id) | 420 | if (NULL == this_id) |
@@ -445,14 +445,6 @@ run (void *cls, | |||
445 | return; | 445 | return; |
446 | } | 446 | } |
447 | } | 447 | } |
448 | if ( (args[0] == NULL) && | ||
449 | (uri_string == NULL) ) | ||
450 | { | ||
451 | fprintf (stderr, | ||
452 | _("Need the name of a file to publish!\n")); | ||
453 | ret = 1; | ||
454 | return; | ||
455 | } | ||
456 | cfg = c; | 448 | cfg = c; |
457 | ctx = GNUNET_FS_start (sched, | 449 | ctx = GNUNET_FS_start (sched, |
458 | cfg, | 450 | cfg, |