From: Richard Russon Date: Sat, 14 Jul 2018 16:28:49 +0000 (+0100) Subject: tidy url X-Git-Tag: 2019-10-25~755^2~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06d20953db2625a9691dbbddc0360e34ca86d357;p=neomutt tidy url --- diff --git a/email/url.c b/email/url.c index 422bc49ef..7dd63a2d8 100644 --- a/email/url.c +++ b/email/url.c @@ -65,7 +65,7 @@ int url_pct_decode(char *s) if (*s == '%') { if (s[1] && s[2] && isxdigit((unsigned char) s[1]) && - isxdigit((unsigned char) s[2]) && hexval(s[1]) >= 0 && hexval(s[2]) >= 0) + isxdigit((unsigned char) s[2]) && (hexval(s[1]) >= 0) && (hexval(s[2]) >= 0)) { *d++ = (hexval(s[1]) << 4) | (hexval(s[2])); s += 2; @@ -93,7 +93,7 @@ enum UrlScheme url_check_scheme(const char *s) if (!s || !(t = strchr(s, ':'))) return U_UNKNOWN; - if ((size_t)(t - s) >= sizeof(sbuf) - 1) + if ((size_t)(t - s) >= (sizeof(sbuf) - 1)) return U_UNKNOWN; mutt_str_strfcpy(sbuf, s, t - s + 1); @@ -250,7 +250,7 @@ int url_parse(struct Url *u, char *src) { int num; *p++ = '\0'; - if (mutt_str_atoi(p, &num) < 0 || num < 0 || num > 0xffff) + if ((mutt_str_atoi(p, &num) < 0) || (num < 0) || (num > 0xffff)) goto err; u->port = (unsigned short) num; }