summaryrefslogtreecommitdiff
path: root/utils/nsurl.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2015-10-31 13:23:08 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2015-10-31 13:44:06 +0000
commit25cd49034cb8133223e44dfc763c8d736f2135ba (patch)
treec05894c46c2c332e8ba1801a06f5ed54bd627da4 /utils/nsurl.c
parent78067fc29a89452a08a10d6b907f81e4ce77fbb9 (diff)
downloadnetsurf-25cd49034cb8133223e44dfc763c8d736f2135ba.tar.gz
netsurf-25cd49034cb8133223e44dfc763c8d736f2135ba.tar.bz2
Style guide adherence.
Diffstat (limited to 'utils/nsurl.c')
-rw-r--r--utils/nsurl.c27
1 files changed, 16 insertions, 11 deletions
diff --git a/utils/nsurl.c b/utils/nsurl.c
index 4ae65ecb6..1024bcf37 100644
--- a/utils/nsurl.c
+++ b/utils/nsurl.c
@@ -1715,34 +1715,39 @@ nserror nsurl_get_utf8(const nsurl *url, char **url_s, size_t *url_l)
host = nsurl_get_component(url, NSURL_HOST);
- if(host == NULL)
+ if (host == NULL)
return NSERROR_BAD_URL;
err = idna_decode(lwc_string_data(host), lwc_string_length(host),
- &idna_host, &idna_host_len);
+ &idna_host, &idna_host_len);
lwc_string_unref(host);
if (err != NSERROR_OK)
+ if (err != NSERROR_OK) {
return err;
+ }
- err = nsurl_get(url, NSURL_SCHEME | NSURL_CREDENTIALS,
- &scheme, &scheme_len);
-
- if (err != NSERROR_OK)
+ err = nsurl_get(url,
+ NSURL_SCHEME | NSURL_CREDENTIALS,
+ &scheme, &scheme_len);
+ if (err != NSERROR_OK) {
return err;
+ }
- err = nsurl_get(url, NSURL_PORT | NSURL_PATH | NSURL_QUERY | NSURL_FRAGMENT,
- &path, &path_len);
-
- if (err != NSERROR_OK)
+ err = nsurl_get(url,
+ NSURL_PORT | NSURL_PATH | NSURL_QUERY | NSURL_FRAGMENT,
+ &path, &path_len);
+ if (err != NSERROR_OK) {
return err;
+ }
*url_l = scheme_len + idna_host_len + path_len + 1; /* +1 for \0 */
*url_s = malloc(*url_l);
- if (*url_s == NULL)
+ if (*url_s == NULL) {
return NSERROR_NOMEM;
+ }
snprintf(*url_s, *url_l, "%s%s%s", scheme, idna_host, path);