From 1d4471ee16f247ba10b14023f7abcd31201b4e32 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 24 Jan 2015 01:54:59 +0100 Subject: [PATCH] Cleanups for parse_url --- net_http.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/net_http.c b/net_http.c index ebb9df6205..bba72fda5c 100644 --- a/net_http.c +++ b/net_http.c @@ -39,41 +39,38 @@ enum static bool net_http_parse_url(char *url, char **domain, int *port, char **location) { - char* scan; + char* scan; - if (strncmp(url, "http://", strlen("http://")) != 0) + if (strncmp(url, "http://", strlen("http://")) != 0) return false; - scan = url + strlen("http://"); - *domain = scan; + scan = url + strlen("http://"); + *domain = scan; - while (*scan!='/' && *scan!=':' && *scan!='\0') + while (*scan != '/' && *scan != ':' && *scan != '\0') scan++; - if (*scan == '\0') + if (*scan == '\0') return false; - if (*scan == ':') - { - *scan='\0'; + *scan = '\0'; + *port = 80; - if (!isdigit(scan[1])) + if (*scan == ':') + { + + if (!isdigit(scan[1])) return false; - *port = strtoul(scan+1, &scan, 10); + *port = strtoul(scan + 1, &scan, 10); - if (*scan != '/') + if (*scan != '/') return false; - } - else /* known '/' */ - { - *scan='\0'; - *port=80; - } + } - *location=scan+1; + *location = scan + 1; - return true; + return true; } static int net_http_new_socket(const char * domain, int port)