progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
{
char *s;
- char *s2;
+ const char *s2;
char *t;
switch (info->status)
case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
if (verbose)
{
- s = GNUNET_STRINGS_relative_time_to_string (info->value.download.eta);
+ 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
== GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
- s2 = GNUNET_strdup (_("<unknown time>"));
+ 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.
(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
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 */