aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_uri.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fs/fs_uri.c')
-rw-r--r--src/fs/fs_uri.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 4b25e91ea..90c211415 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -98,7 +98,7 @@
98 * @param key where to store the unique key 98 * @param key where to store the unique key
99 */ 99 */
100void 100void
101GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri, 101GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri,
102 struct GNUNET_HashCode *key) 102 struct GNUNET_HashCode *key)
103{ 103{
104 switch (uri->type) 104 switch (uri->type)
@@ -368,7 +368,7 @@ uri_sks_parse (const char *s, char **emsg)
368 end = strchr (&s[pos], '/'); 368 end = strchr (&s[pos], '/');
369 if ( (NULL == end) || 369 if ( (NULL == end) ||
370 (GNUNET_OK != 370 (GNUNET_OK !=
371 GNUNET_STRINGS_string_to_data (&s[pos], 371 GNUNET_STRINGS_string_to_data (&s[pos],
372 end - &s[pos], 372 end - &s[pos],
373 &ns, 373 &ns,
374 sizeof (ns))) ) 374 sizeof (ns))) )
@@ -526,12 +526,12 @@ struct LocUriAssembly
526 526
527 /** 527 /**
528 * File being offered. 528 * File being offered.
529 */ 529 */
530 struct FileIdentifier fi; 530 struct FileIdentifier fi;
531 531
532 /** 532 /**
533 * Peer offering the file. 533 * Peer offering the file.
534 */ 534 */
535 struct GNUNET_PeerIdentity peer; 535 struct GNUNET_PeerIdentity peer;
536 536
537}; 537};
@@ -947,7 +947,7 @@ GNUNET_FS_uri_loc_create (const struct GNUNET_FS_Uri *baseUri,
947 * @return an FS URI for the given namespace and identifier 947 * @return an FS URI for the given namespace and identifier
948 */ 948 */
949struct GNUNET_FS_Uri * 949struct GNUNET_FS_Uri *
950GNUNET_FS_uri_sks_create (const struct GNUNET_CRYPTO_EccPublicSignKey *ns, 950GNUNET_FS_uri_sks_create (const struct GNUNET_CRYPTO_EccPublicSignKey *ns,
951 const char *id) 951 const char *id)
952{ 952{
953 struct GNUNET_FS_Uri *ns_uri; 953 struct GNUNET_FS_Uri *ns_uri;
@@ -1424,7 +1424,7 @@ GNUNET_FS_uri_test_loc (const struct GNUNET_FS_Uri *uri)
1424 * Add a keyword as non-mandatory (with ' '-prefix) to the 1424 * Add a keyword as non-mandatory (with ' '-prefix) to the
1425 * given keyword list at offset 'index'. The array is 1425 * given keyword list at offset 'index'. The array is
1426 * guaranteed to be long enough. 1426 * guaranteed to be long enough.
1427 * 1427 *
1428 * @param s keyword to add 1428 * @param s keyword to add
1429 * @param array array to add the keyword to 1429 * @param array array to add the keyword to
1430 * @param index offset where to add the keyword 1430 * @param index offset where to add the keyword
@@ -1439,14 +1439,14 @@ insert_non_mandatory_keyword (const char *s, char **array, int index)
1439 1439
1440 1440
1441/** 1441/**
1442 * Test if the given keyword 's' is already present in the 1442 * Test if the given keyword 's' is already present in the
1443 * given array, ignoring the '+'-mandatory prefix in the array. 1443 * given array, ignoring the '+'-mandatory prefix in the array.
1444 * 1444 *
1445 * @param s keyword to test 1445 * @param s keyword to test
1446 * @param array keywords to test against, with ' ' or '+' prefix to ignore 1446 * @param array keywords to test against, with ' ' or '+' prefix to ignore
1447 * @param array_length length of the array 1447 * @param array_length length of the array
1448 * @return GNUNET_YES if the keyword exists, GNUNET_NO if not 1448 * @return GNUNET_YES if the keyword exists, GNUNET_NO if not
1449 */ 1449 */
1450static int 1450static int
1451find_duplicate (const char *s, const char **array, int array_length) 1451find_duplicate (const char *s, const char **array, int array_length)
1452{ 1452{
@@ -1535,7 +1535,7 @@ u8_strcount (const uint8_t *s)
1535 * to it are used to check for duplicates). ignored if array == NULL. 1535 * to it are used to check for duplicates). ignored if array == NULL.
1536 * @return number of tokens counted (including duplicates), or number of 1536 * @return number of tokens counted (including duplicates), or number of
1537 * tokens extracted (excluding duplicates). 0 if there are no 1537 * tokens extracted (excluding duplicates). 0 if there are no
1538 * matching parens in the string (when counting), or when all tokens 1538 * matching parens in the string (when counting), or when all tokens
1539 * were duplicates (when extracting). 1539 * were duplicates (when extracting).
1540 */ 1540 */
1541static int 1541static int
@@ -1612,7 +1612,7 @@ get_keywords_from_parens (const char *s, char **array, int index)
1612 else 1612 else
1613 count++; 1613 count++;
1614 close_paren[0] = tmp; 1614 close_paren[0] = tmp;
1615 } 1615 }
1616 } 1616 }
1617 GNUNET_free (ss); 1617 GNUNET_free (ss);
1618 return count; 1618 return count;
@@ -1900,7 +1900,7 @@ uri_sks_to_string (const struct GNUNET_FS_Uri *uri)
1900 GNUNET_assert (NULL != ret); 1900 GNUNET_assert (NULL != ret);
1901 ret[0] = '\0'; 1901 ret[0] = '\0';
1902 GNUNET_asprintf (&ret, "%s%s%s/%s", GNUNET_FS_URI_PREFIX, 1902 GNUNET_asprintf (&ret, "%s%s%s/%s", GNUNET_FS_URI_PREFIX,
1903 GNUNET_FS_URI_SKS_INFIX, buf, 1903 GNUNET_FS_URI_SKS_INFIX, buf,
1904 uri->data.sks.identifier); 1904 uri->data.sks.identifier);
1905 return ret; 1905 return ret;
1906} 1906}
@@ -2003,7 +2003,7 @@ uri_loc_to_string (const struct GNUNET_FS_Uri *uri)
2003 peerSig = 2003 peerSig =
2004 bin2enc (&uri->data.loc.contentSignature, 2004 bin2enc (&uri->data.loc.contentSignature,
2005 sizeof (struct GNUNET_CRYPTO_EccSignature)); 2005 sizeof (struct GNUNET_CRYPTO_EccSignature));
2006 GNUNET_asprintf (&ret, 2006 GNUNET_asprintf (&ret,
2007 "%s%s%s.%s.%llu.%s.%s.%llu", GNUNET_FS_URI_PREFIX, 2007 "%s%s%s.%s.%llu.%s.%s.%llu", GNUNET_FS_URI_PREFIX,
2008 GNUNET_FS_URI_LOC_INFIX, (const char *) &keyhash, 2008 GNUNET_FS_URI_LOC_INFIX, (const char *) &keyhash,
2009 (const char *) &queryhash, 2009 (const char *) &queryhash,