struct GNUNET_CRYPTO_HashAsciiEncoded enc;
GNUNET_CRYPTO_hash_to_enc (id, &enc);
- fprintf (stdout, "%s (%s)\n", name, (const char *) &enc);
+ FPRINTF (stdout, "%s (%s)\n", name, (const char *) &enc);
}
static int
-pseudo_printer (void *cls,
- const GNUNET_HashCode *
- pseudonym,
+pseudo_printer (void *cls, const GNUNET_HashCode * pseudonym,
+ const char *name, const char *unique_name,
const struct GNUNET_CONTAINER_MetaData *md, int rating)
{
- char *id;
-
- id = GNUNET_PSEUDONYM_id_to_name (cfg, pseudonym);
- if (id == NULL)
+ char *id, *unique_id;
+ int getinfo_result;
+
+ /* While we get a name from the caller, it might be NULL.
+ * GNUNET_PSEUDONYM_get_info () never returns NULL.
+ */
+ getinfo_result = GNUNET_PSEUDONYM_get_info (cfg, pseudonym,
+ NULL, NULL, &id, NULL);
+ if (getinfo_result != GNUNET_OK)
{
GNUNET_break (0);
return GNUNET_OK;
}
- fprintf (stdout, "%s (%d):\n", id, rating);
- GNUNET_CONTAINER_meta_data_iterate (md, &EXTRACTOR_meta_data_print, stdout);
- fprintf (stdout, "\n");
+ unique_id = GNUNET_PSEUDONYM_name_uniquify (cfg, pseudonym, id, NULL);
GNUNET_free (id);
+ FPRINTF (stdout, "%s (%d):\n", unique_id, rating);
+ GNUNET_CONTAINER_meta_data_iterate (md, &EXTRACTOR_meta_data_print, stdout);
+ FPRINTF (stdout, "%s", "\n");
+ GNUNET_free (unique_id);
return GNUNET_OK;
}
if (emsg != NULL)
{
- fprintf (stderr, "%s", emsg);
+ FPRINTF (stderr, "%s", emsg);
ret = 1;
}
if (ns != NULL)
set++;
if (*set != ':')
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Invalid argument `%s'\n"), rating_change);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Invalid argument `%s'\n"),
+ rating_change);
}
else
{
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Namespace `%s' unknown.\n"), rating_change);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ ("Namespace `%s' unknown. Make sure you specify its numeric suffix, if any.\n"),
+ rating_change);
}
}
GNUNET_free (rating_change);
* @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)
{
char *emsg;
cfg = c;
- h = GNUNET_FS_start (cfg,
- "gnunet-pseudonym",
- &progress_cb,
- NULL, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
+ h = GNUNET_FS_start (cfg, "gnunet-pseudonym", &progress_cb, NULL,
+ GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
if (NULL != delete_ns)
{
ns = GNUNET_FS_namespace_create (h, delete_ns);
ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/namespace", &emsg);
GNUNET_assert (NULL == emsg);
}
- GNUNET_FS_namespace_advertise (h,
- ksk_uri,
- ns,
- adv_metadata,
- &bo,
- root_identifier,
- &post_advertising, NULL);
+ GNUNET_FS_namespace_advertise (h, ksk_uri, ns, adv_metadata, &bo,
+ root_identifier, &post_advertising,
+ NULL);
return;
}
else
{
if (ksk_uri != NULL)
- fprintf (stderr, _("Option `%s' ignored\n"), "-k");
+ FPRINTF (stderr, _("Option `%s' ignored\n"), "-k");
}
}
}
else
{
if (root_identifier != NULL)
- fprintf (stderr, _("Option `%s' ignored\n"), "-r");
+ FPRINTF (stderr, _("Option `%s' ignored\n"), "-r");
if (ksk_uri != NULL)
- fprintf (stderr, _("Option `%s' ignored\n"), "-k");
+ FPRINTF (stderr, _("Option `%s' ignored\n"), "-k");
}
post_advertising (NULL, NULL, NULL);
gettext_noop ("delete namespace NAME "),
1, &GNUNET_GETOPT_set_string, &delete_ns},
{'k', "keyword", "VALUE",
- gettext_noop
- ("add an additional keyword for the advertisment"
- " (this option can be specified multiple times)"),
+ gettext_noop ("add an additional keyword for the advertisment"
+ " (this option can be specified multiple times)"),
1, &GNUNET_FS_getopt_set_keywords, &ksk_uri},
{'m', "meta", "TYPE:VALUE",
gettext_noop ("set the meta-data for the given TYPE to the given VALUE"),