diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-04-14 20:21:41 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-04-14 20:21:41 +0000 |
commit | ce52e258a28a17f5c319549fda1b5fbb8f6169a7 (patch) | |
tree | a1198190a418df4c35f2ccd19139f4f67e0c240b /src/fs/fs_uri.c | |
parent | acc6f8a81932a50650ab2aa2d52d6f873f8a2060 (diff) | |
download | gnunet-ce52e258a28a17f5c319549fda1b5fbb8f6169a7.tar.gz gnunet-ce52e258a28a17f5c319549fda1b5fbb8f6169a7.zip |
renaming GNUNET_PSEUDONYM_-API to GNUNET_FS_pseudonym-API
Diffstat (limited to 'src/fs/fs_uri.c')
-rw-r--r-- | src/fs/fs_uri.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c index a3a54227f..48c347a52 100644 --- a/src/fs/fs_uri.c +++ b/src/fs/fs_uri.c | |||
@@ -356,7 +356,7 @@ static struct GNUNET_FS_Uri * | |||
356 | uri_sks_parse (const char *s, char **emsg) | 356 | uri_sks_parse (const char *s, char **emsg) |
357 | { | 357 | { |
358 | struct GNUNET_FS_Uri *ret; | 358 | struct GNUNET_FS_Uri *ret; |
359 | struct GNUNET_PseudonymIdentifier id; | 359 | struct GNUNET_FS_PseudonymIdentifier id; |
360 | size_t pos; | 360 | size_t pos; |
361 | char *end; | 361 | char *end; |
362 | 362 | ||
@@ -969,7 +969,7 @@ GNUNET_FS_uri_sks_create (struct GNUNET_FS_Namespace *ns, const char *id, | |||
969 | * @return an FS URI for the given namespace and identifier | 969 | * @return an FS URI for the given namespace and identifier |
970 | */ | 970 | */ |
971 | struct GNUNET_FS_Uri * | 971 | struct GNUNET_FS_Uri * |
972 | GNUNET_FS_uri_sks_create_from_nsid (struct GNUNET_PseudonymIdentifier *pseudonym, | 972 | GNUNET_FS_uri_sks_create_from_nsid (struct GNUNET_FS_PseudonymIdentifier *pseudonym, |
973 | const char *id) | 973 | const char *id) |
974 | { | 974 | { |
975 | struct GNUNET_FS_Uri *ns_uri; | 975 | struct GNUNET_FS_Uri *ns_uri; |
@@ -1280,7 +1280,7 @@ GNUNET_FS_uri_test_equal (const struct GNUNET_FS_Uri *u1, | |||
1280 | case GNUNET_FS_URI_SKS: | 1280 | case GNUNET_FS_URI_SKS: |
1281 | if ((0 == | 1281 | if ((0 == |
1282 | memcmp (&u1->data.sks.ns, &u2->data.sks.ns, | 1282 | memcmp (&u1->data.sks.ns, &u2->data.sks.ns, |
1283 | sizeof (struct GNUNET_PseudonymIdentifier))) && | 1283 | sizeof (struct GNUNET_FS_PseudonymIdentifier))) && |
1284 | (0 == strcmp (u1->data.sks.identifier, u2->data.sks.identifier))) | 1284 | (0 == strcmp (u1->data.sks.identifier, u2->data.sks.identifier))) |
1285 | 1285 | ||
1286 | return GNUNET_YES; | 1286 | return GNUNET_YES; |
@@ -1341,7 +1341,7 @@ GNUNET_FS_uri_test_sks (const struct GNUNET_FS_Uri *uri) | |||
1341 | */ | 1341 | */ |
1342 | int | 1342 | int |
1343 | GNUNET_FS_uri_sks_get_namespace (const struct GNUNET_FS_Uri *uri, | 1343 | GNUNET_FS_uri_sks_get_namespace (const struct GNUNET_FS_Uri *uri, |
1344 | struct GNUNET_PseudonymIdentifier *pseudonym) | 1344 | struct GNUNET_FS_PseudonymIdentifier *pseudonym) |
1345 | { | 1345 | { |
1346 | if (!GNUNET_FS_uri_test_sks (uri)) | 1346 | if (!GNUNET_FS_uri_test_sks (uri)) |
1347 | { | 1347 | { |
@@ -1389,9 +1389,9 @@ GNUNET_FS_uri_sks_to_string_fancy (struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1389 | 1389 | ||
1390 | if (uri->type != GNUNET_FS_URI_SKS) | 1390 | if (uri->type != GNUNET_FS_URI_SKS) |
1391 | return NULL; | 1391 | return NULL; |
1392 | (void) GNUNET_PSEUDONYM_get_info (cfg, &uri->data.sks.ns, | 1392 | (void) GNUNET_FS_pseudonym_get_info (cfg, &uri->data.sks.ns, |
1393 | NULL, NULL, &name, NULL); | 1393 | NULL, NULL, &name, NULL); |
1394 | unique_name = GNUNET_PSEUDONYM_name_uniquify (cfg, &uri->data.sks.ns, name, NULL); | 1394 | unique_name = GNUNET_FS_pseudonym_name_uniquify (cfg, &uri->data.sks.ns, name, NULL); |
1395 | GNUNET_free (name); | 1395 | GNUNET_free (name); |
1396 | GNUNET_asprintf (&ret, "%s: %s", unique_name, uri->data.sks.identifier); | 1396 | GNUNET_asprintf (&ret, "%s: %s", unique_name, uri->data.sks.identifier); |
1397 | GNUNET_free (unique_name); | 1397 | GNUNET_free (unique_name); |
@@ -1944,7 +1944,7 @@ uri_sks_to_string (const struct GNUNET_FS_Uri *uri) | |||
1944 | if (GNUNET_FS_URI_SKS != uri->type) | 1944 | if (GNUNET_FS_URI_SKS != uri->type) |
1945 | return NULL; | 1945 | return NULL; |
1946 | ret = GNUNET_STRINGS_data_to_string (&uri->data.sks.ns, | 1946 | ret = GNUNET_STRINGS_data_to_string (&uri->data.sks.ns, |
1947 | sizeof (struct GNUNET_PseudonymIdentifier), | 1947 | sizeof (struct GNUNET_FS_PseudonymIdentifier), |
1948 | buf, | 1948 | buf, |
1949 | sizeof (buf)); | 1949 | sizeof (buf)); |
1950 | GNUNET_assert (NULL != ret); | 1950 | GNUNET_assert (NULL != ret); |