X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Fgnunet-unindex.c;h=3e8308df249c95f81877890e20f026f8cd1b7196;hb=b0c7119fa2f43fe1b5978651152974359de5a5d2;hp=a4aad456860a817d6bdda20ee47d7dfe4db568a3;hpb=502af2167f7c218366666ca4944bd7cc54b5b19a;p=oweals%2Fgnunet.git diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c index a4aad4568..3e8308df2 100644 --- a/src/fs/gnunet-unindex.c +++ b/src/fs/gnunet-unindex.c @@ -61,7 +61,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } /** - * Called by FS client to give information about the progress of an + * Called by FS client to give information about the progress of an * operation. * * @param cls closure @@ -86,30 +86,27 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) if (verbose) { s = GNUNET_STRINGS_relative_time_to_string (info->value.unindex.eta); - fprintf (stdout, - _("Unindexing at %llu/%llu (%s remaining)\n"), + FPRINTF (stdout, _("Unindexing at %llu/%llu (%s remaining)\n"), (unsigned long long) info->value.unindex.completed, (unsigned long long) info->value.unindex.size, s); GNUNET_free (s); } break; case GNUNET_FS_STATUS_UNINDEX_ERROR: - fprintf (stderr, - _("Error unindexing: %s.\n"), + FPRINTF (stderr, _("Error unindexing: %s.\n"), info->value.unindex.specifics.error.message); GNUNET_SCHEDULER_shutdown (); break; case GNUNET_FS_STATUS_UNINDEX_COMPLETED: - fprintf (stdout, _("Unindexing done.\n")); + FPRINTF (stdout, "%s", _("Unindexing done.\n")); GNUNET_SCHEDULER_shutdown (); break; case GNUNET_FS_STATUS_UNINDEX_STOPPED: - GNUNET_SCHEDULER_add_continuation (&cleanup_task, - NULL, + GNUNET_SCHEDULER_add_continuation (&cleanup_task, NULL, GNUNET_SCHEDULER_REASON_PREREQ_DONE); break; default: - fprintf (stderr, _("Unexpected status: %d\n"), info->status); + FPRINTF (stderr, _("Unexpected status: %d\n"), info->status); break; } return NULL; @@ -125,9 +122,8 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) * @param c configuration */ static void -run (void *cls, - char *const *args, - const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) +run (void *cls, char *const *args, const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *c) { /* check arguments */ if ((args[0] == NULL) || (args[1] != NULL)) @@ -137,25 +133,24 @@ run (void *cls, return; } cfg = c; - ctx = GNUNET_FS_start (cfg, - "gnunet-unindex", - &progress_cb, - NULL, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); + ctx = + GNUNET_FS_start (cfg, "gnunet-unindex", &progress_cb, NULL, + GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); if (NULL == ctx) { - fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS"); + FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS"); ret = 1; return; } uc = GNUNET_FS_unindex_start (ctx, args[0], NULL); if (NULL == uc) { - fprintf (stderr, _("Could not start unindex operation.\n")); + FPRINTF (stderr, "%s", _("Could not start unindex operation.\n")); GNUNET_FS_stop (ctx); return; } - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, - &shutdown_task, NULL); + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, + NULL); } @@ -176,9 +171,7 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; return (GNUNET_OK == - GNUNET_PROGRAM_run (argc, - argv, - "gnunet-unindex [OPTIONS] FILENAME", + GNUNET_PROGRAM_run (argc, argv, "gnunet-unindex [OPTIONS] FILENAME", gettext_noop ("Unindex a file that was previously indexed with gnunet-publish."), options, &run, NULL)) ? ret : 1;