X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Furl.c;h=6be4d96489351d84374642169f38e94d7f132996;hb=e86fe357adb9fb88f8e83950c52efaf95800a5ac;hp=44c5a6dc9cc166406e06a7dcd8fe6a742e2dc945;hpb=e5080111671c910836a7a6cc2aaf4704398825fc;p=netdata.git diff --git a/src/url.c b/src/url.c index 44c5a6dc..6be4d964 100644 --- a/src/url.c +++ b/src/url.c @@ -6,72 +6,72 @@ /* Converts a hex character to its integer value */ char from_hex(char ch) { - return (char)(isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10); + return (char)(isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10); } /* Converts an integer value to its hex character*/ char to_hex(char code) { - static char hex[] = "0123456789abcdef"; - return hex[code & 15]; + static char hex[] = "0123456789abcdef"; + return hex[code & 15]; } /* Returns a url-encoded version of str */ /* IMPORTANT: be sure to free() the returned string after use */ char *url_encode(char *str) { - char *buf, *pbuf; + char *buf, *pbuf; - pbuf = buf = mallocz(strlen(str) * 3 + 1); + pbuf = buf = mallocz(strlen(str) * 3 + 1); - while (*str) { - if (isalnum(*str) || *str == '-' || *str == '_' || *str == '.' || *str == '~') - *pbuf++ = *str; + while (*str) { + if (isalnum(*str) || *str == '-' || *str == '_' || *str == '.' || *str == '~') + *pbuf++ = *str; - else if (*str == ' ') - *pbuf++ = '+'; + else if (*str == ' ') + *pbuf++ = '+'; - else - *pbuf++ = '%', *pbuf++ = to_hex(*str >> 4), *pbuf++ = to_hex(*str & 15); + else + *pbuf++ = '%', *pbuf++ = to_hex(*str >> 4), *pbuf++ = to_hex(*str & 15); - str++; - } - *pbuf = '\0'; + str++; + } + *pbuf = '\0'; - pbuf = strdupz(buf); - freez(buf); - return pbuf; + pbuf = strdupz(buf); + freez(buf); + return pbuf; } /* Returns a url-decoded version of str */ /* IMPORTANT: be sure to free() the returned string after use */ char *url_decode(char *str) { - size_t size = strlen(str) + 1; + size_t size = strlen(str) + 1; - char *buf = mallocz(size); - return url_decode_r(buf, str, size); + char *buf = mallocz(size); + return url_decode_r(buf, str, size); } char *url_decode_r(char *to, char *url, size_t size) { - char *s = url, // source - *d = to, // destination - *e = &to[size - 1]; // destination end + char *s = url, // source + *d = to, // destination + *e = &to[size - 1]; // destination end - while(*s && d < e) { - if(unlikely(*s == '%')) { - if(likely(s[1] && s[2])) { - *d++ = from_hex(s[1]) << 4 | from_hex(s[2]); - s += 2; - } - } - else if(unlikely(*s == '+')) - *d++ = ' '; + while(*s && d < e) { + if(unlikely(*s == '%')) { + if(likely(s[1] && s[2])) { + *d++ = from_hex(s[1]) << 4 | from_hex(s[2]); + s += 2; + } + } + else if(unlikely(*s == '+')) + *d++ = ' '; - else - *d++ = *s; + else + *d++ = *s; - s++; - } + s++; + } - *d = '\0'; + *d = '\0'; - return to; + return to; }