projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-fixing #2413
[oweals/gnunet.git]
/
src
/
fs
/
gnunet-search.c
diff --git
a/src/fs/gnunet-search.c
b/src/fs/gnunet-search.c
index eb534583348dbf88fb40a771dbf235624efacc6f..60620a4b3abf114f6eb2e462275c5016cecdda0d 100644
(file)
--- a/
src/fs/gnunet-search.c
+++ b/
src/fs/gnunet-search.c
@@
-62,7
+62,7
@@
static int local_only;
* used in the main libextractor library and yielding
* meta data).
* @param type libextractor-type describing the meta data
* used in the main libextractor library and yielding
* meta data).
* @param type libextractor-type describing the meta data
- * @param format basic format information about data
+ * @param format basic format information about data
* @param data_mime_type mime-type of data (not of the original file);
* can be NULL (if mime-type is not known)
* @param data actual meta-data found
* @param data_mime_type mime-type of data (not of the original file);
* can be NULL (if mime-type is not known)
* @param data actual meta-data found
@@
-107,7
+107,7
@@
clean_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE))
{
GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE))
{
-
fprintf
(stderr,
+
FPRINTF
(stderr,
_("Failed to write directory with search results to `%s'\n"),
output_filename);
}
_("Failed to write directory with search results to `%s'\n"),
output_filename);
}
@@
-117,7
+117,7
@@
clean_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
* operation.
*
* @param cls closure
@@
-178,7
+178,7
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
/* ignore */
break;
case GNUNET_FS_STATUS_SEARCH_ERROR:
/* ignore */
break;
case GNUNET_FS_STATUS_SEARCH_ERROR:
-
fprintf
(stderr, _("Error searching: %s.\n"),
+
FPRINTF
(stderr, _("Error searching: %s.\n"),
info->value.search.specifics.error.message);
GNUNET_SCHEDULER_shutdown ();
break;
info->value.search.specifics.error.message);
GNUNET_SCHEDULER_shutdown ();
break;
@@
-187,7
+187,7
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
default:
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;
break;
}
return NULL;
@@
-228,7
+228,7
@@
run (void *cls, char *const *args, const char *cfgfile,
uri = GNUNET_FS_uri_ksk_create_from_args (argc, (const char **) args);
if (NULL == uri)
{
uri = GNUNET_FS_uri_ksk_create_from_args (argc, (const char **) args);
if (NULL == uri)
{
-
fprintf (stderr,
_("Could not create keyword URI from arguments.\n"));
+
FPRINTF (stderr, "%s",
_("Could not create keyword URI from arguments.\n"));
ret = 1;
return;
}
ret = 1;
return;
}
@@
-238,7
+238,7
@@
run (void *cls, char *const *args, const char *cfgfile,
GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
if (NULL == ctx)
{
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");
GNUNET_FS_uri_destroy (uri);
ret = 1;
return;
GNUNET_FS_uri_destroy (uri);
ret = 1;
return;
@@
-252,7
+252,7
@@
run (void *cls, char *const *args, const char *cfgfile,
GNUNET_FS_uri_destroy (uri);
if (NULL == sc)
{
GNUNET_FS_uri_destroy (uri);
if (NULL == sc)
{
-
fprintf (stderr,
_("Could not start searching.\n"));
+
FPRINTF (stderr, "%s",
_("Could not start searching.\n"));
GNUNET_FS_stop (ctx);
ret = 1;
return;
GNUNET_FS_stop (ctx);
ret = 1;
return;
@@
-299,7
+299,7
@@
main (int argc, char *const *argv)
{'N', "results", "VALUE",
gettext_noop
("automatically terminate search after VALUE results are found"),
{'N', "results", "VALUE",
gettext_noop
("automatically terminate search after VALUE results are found"),
- 1, &GNUNET_GETOPT_set_u
long
, &results_limit},
+ 1, &GNUNET_GETOPT_set_u
int
, &results_limit},
GNUNET_GETOPT_OPTION_END
};
return (GNUNET_OK ==
GNUNET_GETOPT_OPTION_END
};
return (GNUNET_OK ==