d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r284346:

Browse Source 
Fix the following clang 3.7.0 warnings in lib/libfetch/http.c:

    lib/libfetch/http.c:1628:26: error: address of array 'purl->user'
    will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
                                    aparams.user = purl->user ?
                                                   ~~~~~~^~~~ ~
    lib/libfetch/http.c:1630:30: error: address of array 'purl->pwd'
    will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
                                    aparams.password = purl->pwd?
                                                       ~~~~~~^~~~
    lib/libfetch/http.c:1657:25: error: address of array 'url->user'
    will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
                                    aparams.user = url->user ?
                                                   ~~~~~^~~~ ~
    lib/libfetch/http.c:1659:29: error: address of array 'url->pwd'
    will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
                                    aparams.password = url->pwd ?
                                                       ~~~~~^~~ ~
    lib/libfetch/http.c:1669:25: error: address of array 'url->user'
    will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
                                    aparams.user = url->user ?
                                                   ~~~~~^~~~ ~
    lib/libfetch/http.c:1671:29: error: address of array 'url->pwd'
    will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
                                    aparams.password = url->pwd ?
                                                       ~~~~~^~~ ~

Since url->user and url->pwd are arrays, they can never be NULL, so the
checks can be removed.

Reviewed by:	bapt
Differential Revision: https://reviews.freebsd.org/D2673
This commit is contained in:
dim 2015-06-20 13:30:09 +00:00
parent f96f7b3d8f
commit d3e521cfec
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libfetch/http.c
View File

@ -1625,10 +1625,8 @@ http_request_body(struct url *URL, const char *op, struct url_stat *us,
http_auth_params_t aparams; http_auth_params_t aparams;
init_http_auth_params(&aparams); init_http_auth_params(&aparams);
if (*purl->user || *purl->pwd) { if (*purl->user || *purl->pwd) {
aparams.user = purl->user ? aparams.user = strdup(purl->user);
strdup(purl->user) : strdup(""); aparams.password = strdup(purl->pwd);
aparams.password = purl->pwd?
strdup(purl->pwd) : strdup("");
} else if ((p = getenv("HTTP_PROXY_AUTH")) != NULL && } else if ((p = getenv("HTTP_PROXY_AUTH")) != NULL &&
*p != '\0') { *p != '\0') {
if (http_authfromenv(p, &aparams) < 0) { if (http_authfromenv(p, &aparams) < 0) {
@ -1654,10 +1652,8 @@ http_request_body(struct url *URL, const char *op, struct url_stat *us,
http_auth_params_t aparams; http_auth_params_t aparams;
init_http_auth_params(&aparams); init_http_auth_params(&aparams);
if (*url->user || *url->pwd) { if (*url->user || *url->pwd) {
aparams.user = url->user ? aparams.user = strdup(url->user);
strdup(url->user) : strdup(""); aparams.password = strdup(url->pwd);
aparams.password = url->pwd ?
strdup(url->pwd) : strdup("");
} else if ((p = getenv("HTTP_AUTH")) != NULL && } else if ((p = getenv("HTTP_AUTH")) != NULL &&
*p != '\0') { *p != '\0') {
if (http_authfromenv(p, &aparams) < 0) { if (http_authfromenv(p, &aparams) < 0) {
@ -1666,10 +1662,8 @@ http_request_body(struct url *URL, const char *op, struct url_stat *us,
} }
} else if (fetchAuthMethod && } else if (fetchAuthMethod &&
fetchAuthMethod(url) == 0) { fetchAuthMethod(url) == 0) {
aparams.user = url->user ? aparams.user = strdup(url->user);
strdup(url->user) : strdup(""); aparams.password = strdup(url->pwd);
aparams.password = url->pwd ?
strdup(url->pwd) : strdup("");
} else { } else {
http_seterr(HTTP_NEED_AUTH); http_seterr(HTTP_NEED_AUTH);
goto ouch; goto ouch;