diff options
-rw-r--r-- | src/include/gnunet_uri_lib.h | 8 | ||||
-rw-r--r-- | src/util/test_uri.c | 8 | ||||
-rw-r--r-- | src/util/uri.c | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/include/gnunet_uri_lib.h b/src/include/gnunet_uri_lib.h index e5f144591..d428bdd9a 100644 --- a/src/include/gnunet_uri_lib.h +++ b/src/include/gnunet_uri_lib.h | |||
@@ -31,7 +31,7 @@ | |||
31 | * Note: to make sure that no strings are copied, the first slash "/" in the | 31 | * Note: to make sure that no strings are copied, the first slash "/" in the |
32 | * path will be used to null terminate the hostname if no port is supplied. | 32 | * path will be used to null terminate the hostname if no port is supplied. |
33 | */ | 33 | */ |
34 | struct GNUNET_uri { | 34 | struct GNUNET_Uri { |
35 | char *scheme; /* scheme, without ":" and "//" */ | 35 | char *scheme; /* scheme, without ":" and "//" */ |
36 | char *username; /* username, default: NULL */ | 36 | char *username; /* username, default: NULL */ |
37 | char *password; /* password, default: NULL */ | 37 | char *password; /* password, default: NULL */ |
@@ -44,7 +44,7 @@ struct GNUNET_uri { | |||
44 | 44 | ||
45 | 45 | ||
46 | /* A struct to hold the query string parameter values. */ | 46 | /* A struct to hold the query string parameter values. */ |
47 | struct GNUNET_uri_param { | 47 | struct GNUNET_UriParam { |
48 | char *key; | 48 | char *key; |
49 | char *val; | 49 | char *val; |
50 | }; | 50 | }; |
@@ -70,7 +70,7 @@ struct GNUNET_uri_param { | |||
70 | * Returns 0 on success, otherwise -1. | 70 | * Returns 0 on success, otherwise -1. |
71 | */ | 71 | */ |
72 | int | 72 | int |
73 | GNUNET_uri_parse (struct GNUNET_uri *url, | 73 | GNUNET_uri_parse (struct GNUNET_Uri *url, |
74 | char *url_str); | 74 | char *url_str); |
75 | 75 | ||
76 | 76 | ||
@@ -115,7 +115,7 @@ GNUNET_uri_split_path (char *path, | |||
115 | int | 115 | int |
116 | GNUNET_uri_parse_query (char *query, | 116 | GNUNET_uri_parse_query (char *query, |
117 | char delimiter, | 117 | char delimiter, |
118 | struct GNUNET_uri_param *params, | 118 | struct GNUNET_UriParam *params, |
119 | int max_params); | 119 | int max_params); |
120 | 120 | ||
121 | 121 | ||
diff --git a/src/util/test_uri.c b/src/util/test_uri.c index f9e38383a..7c8156648 100644 --- a/src/util/test_uri.c +++ b/src/util/test_uri.c | |||
@@ -84,7 +84,7 @@ static char * | |||
84 | test_parse_http_url_ok (void) | 84 | test_parse_http_url_ok (void) |
85 | { | 85 | { |
86 | int rc; | 86 | int rc; |
87 | struct GNUNET_uri url; | 87 | struct GNUNET_Uri url; |
88 | char *url_string; | 88 | char *url_string; |
89 | 89 | ||
90 | /* Minimal URL */ | 90 | /* Minimal URL */ |
@@ -397,7 +397,7 @@ static char * | |||
397 | test_parse_http_rel_url_ok (void) | 397 | test_parse_http_rel_url_ok (void) |
398 | { | 398 | { |
399 | int rc; | 399 | int rc; |
400 | struct GNUNET_uri url; | 400 | struct GNUNET_Uri url; |
401 | char *url_string; | 401 | char *url_string; |
402 | 402 | ||
403 | /* Minimal relative URL */ | 403 | /* Minimal relative URL */ |
@@ -492,7 +492,7 @@ static char * | |||
492 | test_parse_url_fail (void) | 492 | test_parse_url_fail (void) |
493 | { | 493 | { |
494 | int rc; | 494 | int rc; |
495 | struct GNUNET_uri url; | 495 | struct GNUNET_Uri url; |
496 | char *url_string; | 496 | char *url_string; |
497 | 497 | ||
498 | /* Empty */ | 498 | /* Empty */ |
@@ -627,7 +627,7 @@ test_parse_query_ok (void) | |||
627 | { | 627 | { |
628 | int rc; | 628 | int rc; |
629 | char *q; | 629 | char *q; |
630 | struct GNUNET_uri_param params[10]; | 630 | struct GNUNET_UriParam params[10]; |
631 | 631 | ||
632 | /* One param query */ | 632 | /* One param query */ |
633 | q = strdup ("q=yes"); | 633 | q = strdup ("q=yes"); |
diff --git a/src/util/uri.c b/src/util/uri.c index ba5c0f716..87101d7e1 100644 --- a/src/util/uri.c +++ b/src/util/uri.c | |||
@@ -156,14 +156,14 @@ find_path (char *str) | |||
156 | * Returns 0 on success, otherwise -1. | 156 | * Returns 0 on success, otherwise -1. |
157 | */ | 157 | */ |
158 | int | 158 | int |
159 | GNUNET_uri_parse (struct GNUNET_uri *url, | 159 | GNUNET_uri_parse (struct GNUNET_Uri *url, |
160 | char *u) | 160 | char *u) |
161 | { | 161 | { |
162 | if (NULL == url || NULL == u) { | 162 | if (NULL == url || NULL == u) { |
163 | return -1; | 163 | return -1; |
164 | } | 164 | } |
165 | 165 | ||
166 | memset(url, 0, sizeof (struct GNUNET_uri)); | 166 | memset(url, 0, sizeof (struct GNUNET_Uri)); |
167 | 167 | ||
168 | /* (Fragment) */ | 168 | /* (Fragment) */ |
169 | url->fragment = find_fragment (u); | 169 | url->fragment = find_fragment (u); |
@@ -311,7 +311,7 @@ GNUNET_uri_split_path (char *path, | |||
311 | int | 311 | int |
312 | GNUNET_uri_parse_query (char *query, | 312 | GNUNET_uri_parse_query (char *query, |
313 | char delimiter, | 313 | char delimiter, |
314 | struct GNUNET_uri_param *params, | 314 | struct GNUNET_UriParam *params, |
315 | int max_params) | 315 | int max_params) |
316 | { | 316 | { |
317 | int i = 0; | 317 | int i = 0; |