diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-05 15:54:47 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-05 15:54:47 +0100 |
commit | 29be1a71b26bed8f6b0317cc4ad12195edd6569f (patch) | |
tree | a45b210c99852e4689de1ef8c1b31e01ca37db4e /src/fs/fs_uri.c | |
parent | 6640e3beca224341f82216442c8e2d417199836f (diff) | |
download | gnunet-29be1a71b26bed8f6b0317cc4ad12195edd6569f.tar.gz gnunet-29be1a71b26bed8f6b0317cc4ad12195edd6569f.zip |
indentation, comment and style fixes, no semantic changes
Diffstat (limited to 'src/fs/fs_uri.c')
-rw-r--r-- | src/fs/fs_uri.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c index fa27e6e9b..11968b750 100644 --- a/src/fs/fs_uri.c +++ b/src/fs/fs_uri.c | |||
@@ -309,7 +309,8 @@ uri_ksk_parse (const char *s, | |||
309 | } | 309 | } |
310 | iret = max; | 310 | iret = max; |
311 | dup = GNUNET_strdup (s); | 311 | dup = GNUNET_strdup (s); |
312 | keywords = GNUNET_malloc (max * sizeof (char *)); | 312 | keywords = GNUNET_new_array (max, |
313 | char *); | ||
313 | for (i = slen - 1; i >= (int) pos; i--) | 314 | for (i = slen - 1; i >= (int) pos; i--) |
314 | { | 315 | { |
315 | if ((s[i] == '%') && (&s[i] == strstr (&s[i], "%22"))) | 316 | if ((s[i] == '%') && (&s[i] == strstr (&s[i], "%22"))) |
@@ -937,7 +938,8 @@ GNUNET_FS_uri_ksk_merge (const struct GNUNET_FS_Uri *u1, | |||
937 | return NULL; | 938 | return NULL; |
938 | } | 939 | } |
939 | kc = u1->data.ksk.keywordCount; | 940 | kc = u1->data.ksk.keywordCount; |
940 | kl = GNUNET_malloc ((kc + u2->data.ksk.keywordCount) * sizeof (char *)); | 941 | kl = GNUNET_new_array (kc + u2->data.ksk.keywordCount, |
942 | char *); | ||
941 | for (i = 0; i < u1->data.ksk.keywordCount; i++) | 943 | for (i = 0; i < u1->data.ksk.keywordCount; i++) |
942 | kl[i] = GNUNET_strdup (u1->data.ksk.keywords[i]); | 944 | kl[i] = GNUNET_strdup (u1->data.ksk.keywords[i]); |
943 | for (i = 0; i < u2->data.ksk.keywordCount; i++) | 945 | for (i = 0; i < u2->data.ksk.keywordCount; i++) |
@@ -991,8 +993,9 @@ GNUNET_FS_uri_dup (const struct GNUNET_FS_Uri *uri) | |||
991 | } | 993 | } |
992 | if (ret->data.ksk.keywordCount > 0) | 994 | if (ret->data.ksk.keywordCount > 0) |
993 | { | 995 | { |
994 | ret->data.ksk.keywords = | 996 | ret->data.ksk.keywords |
995 | GNUNET_malloc (ret->data.ksk.keywordCount * sizeof (char *)); | 997 | = GNUNET_new_array (ret->data.ksk.keywordCount, |
998 | char *); | ||
996 | for (i = 0; i < ret->data.ksk.keywordCount; i++) | 999 | for (i = 0; i < ret->data.ksk.keywordCount; i++) |
997 | ret->data.ksk.keywords[i] = GNUNET_strdup (uri->data.ksk.keywords[i]); | 1000 | ret->data.ksk.keywords[i] = GNUNET_strdup (uri->data.ksk.keywords[i]); |
998 | } | 1001 | } |
@@ -1078,7 +1081,8 @@ GNUNET_FS_uri_ksk_create (const char *keywords, | |||
1078 | *emsg = GNUNET_strdup (_("Number of double-quotes not balanced!\n")); | 1081 | *emsg = GNUNET_strdup (_("Number of double-quotes not balanced!\n")); |
1079 | return NULL; | 1082 | return NULL; |
1080 | } | 1083 | } |
1081 | keywordarr = GNUNET_malloc (num_Words * sizeof (char *)); | 1084 | keywordarr = GNUNET_new_array (num_Words, |
1085 | char *); | ||
1082 | num_Words = 0; | 1086 | num_Words = 0; |
1083 | inWord = 0; | 1087 | inWord = 0; |
1084 | pos = searchString; | 1088 | pos = searchString; |
@@ -1151,7 +1155,8 @@ GNUNET_FS_uri_ksk_create_from_args (unsigned int argc, | |||
1151 | uri = GNUNET_new (struct GNUNET_FS_Uri); | 1155 | uri = GNUNET_new (struct GNUNET_FS_Uri); |
1152 | uri->type = GNUNET_FS_URI_KSK; | 1156 | uri->type = GNUNET_FS_URI_KSK; |
1153 | uri->data.ksk.keywordCount = argc; | 1157 | uri->data.ksk.keywordCount = argc; |
1154 | uri->data.ksk.keywords = GNUNET_malloc (argc * sizeof (char *)); | 1158 | uri->data.ksk.keywords = GNUNET_new_array (argc, |
1159 | char *); | ||
1155 | for (i = 0; i < argc; i++) | 1160 | for (i = 0; i < argc; i++) |
1156 | { | 1161 | { |
1157 | keyword = argv[i]; | 1162 | keyword = argv[i]; |
@@ -1766,8 +1771,9 @@ GNUNET_FS_uri_ksk_create_from_meta_data (const struct GNUNET_CONTAINER_MetaData | |||
1766 | } | 1771 | } |
1767 | /* x3 because there might be a normalized variant of every keyword, | 1772 | /* x3 because there might be a normalized variant of every keyword, |
1768 | plus theoretically one more for mime... */ | 1773 | plus theoretically one more for mime... */ |
1769 | ret->data.ksk.keywords = GNUNET_malloc | 1774 | ret->data.ksk.keywords |
1770 | (sizeof (char *) * (ent + tok_keywords + paren_keywords) * 3); | 1775 | = GNUNET_new_array ((ent + tok_keywords + paren_keywords) * 3, |
1776 | char *); | ||
1771 | GNUNET_CONTAINER_meta_data_iterate (md, &gather_uri_data, ret); | 1777 | GNUNET_CONTAINER_meta_data_iterate (md, &gather_uri_data, ret); |
1772 | } | 1778 | } |
1773 | if (tok_keywords > 0) | 1779 | if (tok_keywords > 0) |