http.c
ClosedPublic
Actions

Authored by dim on May 30 2015, 4:47 PM.

Details

Reviewers

bapt
des

Commits

rS284643: MFC r284346:
rS284346: Fix the following clang 3.7.0 warnings in lib/libfetch/http.c:

Summary

Building world with clang 3.7.0, I got these -Werror 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.

Test Plan

It builds after this diff. :)

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

dim updated this revision to Diff 5805.May 30 2015, 4:47 PM

dim retitled this revision from to Fix clang 3.7.0 warnings in lib/libfetch/http.c.

dim updated this object.

dim edited the test plan for this revision. (Show Details)

dim added reviewers: des, bapt.

dim set the repository for this revision to rS FreeBSD src repository - subversion.

Herald added a subscriber: imp. · View Herald TranscriptMay 30 2015, 4:47 PM

bapt added inline comments.May 30 2015, 4:56 PM

lib/libfetch/http.c
1629 ↗	(On Diff #5805)	if purl->user is not null and purl->pwd is null then you strdup a null entry here

dim added inline comments.May 30 2015, 5:18 PM

lib/libfetch/http.c
1629 ↗	(On Diff #5805)	purl->pwd can never be NULL, since it is an array. If you mean that purl->pwd[0] is a NUL byte, then that is no problem, since it is equivalent to strdup("") in that case. Similar for the case when purl->user[0] is a NUL byte.