adding single location for no_forcestart configuration list

[oweals/gnunet.git] / src / fs / gnunet-download.c

diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index 2293cedd754e3e373b5e167de7c6299331af274e..0938e8316d13bc88a1071d825ca7c67ef351659d 100644 (file)
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -79,9 +79,9 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param n total size of the download
  * @param w desired number of steps in the progress bar
  */
-static void 
-display_bar (unsigned long long x, 
-            unsigned long long n, 
+static void
+display_bar (unsigned long long x,
+            unsigned long long n,
             unsigned int w)
 {
   char buf[w + 20];
@@ -121,13 +121,13 @@ display_bar (unsigned long long x,
  *         for this operation; should be set to NULL for
  *         SUSPEND and STOPPED events).  The value returned
  *         will be passed to future callbacks in the respective
- *         field in the GNUNET_FS_ProgressInfo struct.
+ *         field in the `struct GNUNET_FS_ProgressInfo`
  */
 static void *
 progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
 {
   char *s;
-  char *s2;
+  const char *s2;
   char *t;
 
   switch (info->status)
@@ -140,24 +140,25 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
   case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
     if (verbose)
     {
-      s = GNUNET_STRINGS_relative_time_to_string (info->value.download.eta);
-      if (info->value.download.specifics.progress.block_download_duration.rel_value 
-          == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
-        s2 = GNUNET_strdup (_("<unknown time>"));
+      s = GNUNET_strdup (GNUNET_STRINGS_relative_time_to_string (info->value.download.eta,
+                                                                GNUNET_YES));
+      if (info->value.download.specifics.progress.block_download_duration.rel_value_us
+          == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
+        s2 = _("<unknown time>");
       else
         s2 = GNUNET_STRINGS_relative_time_to_string (
-              info->value.download.specifics.progress.block_download_duration);
+                                                    info->value.download.specifics.progress.block_download_duration,
+                                                    GNUNET_YES);
       t = GNUNET_STRINGS_byte_size_fancy (info->value.download.completed *
                                           1000LL /
                                           (info->value.download.
-                                           duration.rel_value + 1));
+                                           duration.rel_value_us + 1));
       FPRINTF (stdout,
                _("Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to download\n"),
                info->value.download.filename,
                (unsigned long long) info->value.download.completed,
                (unsigned long long) info->value.download.size, s, t, s2);
       GNUNET_free (s);
-      GNUNET_free (s2);
       GNUNET_free (t);
     }
     else
@@ -182,7 +183,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
   case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
     s = GNUNET_STRINGS_byte_size_fancy (info->value.download.completed * 1000 /
                                         (info->value.download.
-                                         duration.rel_value + 1));
+                                         duration.rel_value_us + 1));
 #if !WINDOWS
     if (0 != isatty (1))
       fprintf (stdout, "\n");
@@ -332,11 +333,13 @@ main (int argc, char *const *argv)
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
 
-  return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc, argv, "gnunet-download [OPTIONS] URI",
-                              gettext_noop
-                              ("Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/chk/...)"),
-                              options, &run, NULL)) ? ret : 1;
+  ret = (GNUNET_OK ==
+        GNUNET_PROGRAM_run (argc, argv, "gnunet-download [OPTIONS] URI",
+                            gettext_noop
+                            ("Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/chk/...)"),
+                            options, &run, NULL)) ? ret : 1;
+  GNUNET_free ((void*) argv);
+  return ret;
 }
 
 /* end of gnunet-download.c */