svn commit: r284643 - in stable: 10/lib/libfetch 7/lib/libfetch 8/lib/libfetch 9/lib/libfetch
Dimitry Andric
dim at FreeBSD.org
Sat Jun 20 13:30:10 UTC 2015
Author: dim
Date: Sat Jun 20 13:30:09 2015
New Revision: 284643
URL: https://svnweb.freebsd.org/changeset/base/284643
Log:
MFC r284346:
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
Modified:
stable/9/lib/libfetch/http.c
Directory Properties:
stable/9/ (props changed)
stable/9/lib/ (props changed)
stable/9/lib/libfetch/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/lib/libfetch/http.c
stable/7/lib/libfetch/http.c
stable/8/lib/libfetch/http.c
Directory Properties:
stable/10/ (props changed)
stable/7/ (props changed)
stable/7/lib/ (props changed)
stable/7/lib/libfetch/ (props changed)
stable/8/ (props changed)
stable/8/lib/ (props changed)
stable/8/lib/libfetch/ (props changed)
Modified: stable/9/lib/libfetch/http.c
==============================================================================
--- stable/9/lib/libfetch/http.c Sat Jun 20 13:25:28 2015 (r284642)
+++ stable/9/lib/libfetch/http.c Sat Jun 20 13:30:09 2015 (r284643)
@@ -1625,10 +1625,8 @@ http_request_body(struct url *URL, const
http_auth_params_t aparams;
init_http_auth_params(&aparams);
if (*purl->user || *purl->pwd) {
- aparams.user = purl->user ?
- strdup(purl->user) : strdup("");
- aparams.password = purl->pwd?
- strdup(purl->pwd) : strdup("");
+ aparams.user = strdup(purl->user);
+ aparams.password = strdup(purl->pwd);
} else if ((p = getenv("HTTP_PROXY_AUTH")) != NULL &&
*p != '\0') {
if (http_authfromenv(p, &aparams) < 0) {
@@ -1654,10 +1652,8 @@ http_request_body(struct url *URL, const
http_auth_params_t aparams;
init_http_auth_params(&aparams);
if (*url->user || *url->pwd) {
- aparams.user = url->user ?
- strdup(url->user) : strdup("");
- aparams.password = url->pwd ?
- strdup(url->pwd) : strdup("");
+ aparams.user = strdup(url->user);
+ aparams.password = strdup(url->pwd);
} else if ((p = getenv("HTTP_AUTH")) != NULL &&
*p != '\0') {
if (http_authfromenv(p, &aparams) < 0) {
@@ -1666,10 +1662,8 @@ http_request_body(struct url *URL, const
}
} else if (fetchAuthMethod &&
fetchAuthMethod(url) == 0) {
- aparams.user = url->user ?
- strdup(url->user) : strdup("");
- aparams.password = url->pwd ?
- strdup(url->pwd) : strdup("");
+ aparams.user = strdup(url->user);
+ aparams.password = strdup(url->pwd);
} else {
http_seterr(HTTP_NEED_AUTH);
goto ouch;
More information about the svn-src-stable-9
mailing list