Fix the following clang 3.6.0 warnings in pciconf:
usr.sbin/pciconf/pciconf.c:237:12: error: address of array 'p->pd_name' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] (p->pd_name && *p->pd_name) ? p->pd_name : ~~~^~~~~~~ ~~ usr.sbin/pciconf/pciconf.c:239:12: error: address of array 'p->pd_name' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] (p->pd_name && *p->pd_name) ? (int)p->pd_unit : ~~~^~~~~~~ ~~ The pd_name field of struct pci_conf is an array, so it can never be null. Remove the unnecessary check.
This commit is contained in:
parent
464aad1407
commit
3f7acdfe6e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=277856
@ -234,9 +234,9 @@ list_devs(const char *name, int verbose, int bars, int caps, int errors,
|
|||||||
for (p = conf; p < &conf[pc.num_matches]; p++) {
|
for (p = conf; p < &conf[pc.num_matches]; p++) {
|
||||||
printf("%s%d@pci%d:%d:%d:%d:\tclass=0x%06x card=0x%08x "
|
printf("%s%d@pci%d:%d:%d:%d:\tclass=0x%06x card=0x%08x "
|
||||||
"chip=0x%08x rev=0x%02x hdr=0x%02x\n",
|
"chip=0x%08x rev=0x%02x hdr=0x%02x\n",
|
||||||
(p->pd_name && *p->pd_name) ? p->pd_name :
|
*p->pd_name ? p->pd_name :
|
||||||
"none",
|
"none",
|
||||||
(p->pd_name && *p->pd_name) ? (int)p->pd_unit :
|
*p->pd_name ? (int)p->pd_unit :
|
||||||
none_count++, p->pc_sel.pc_domain,
|
none_count++, p->pc_sel.pc_domain,
|
||||||
p->pc_sel.pc_bus, p->pc_sel.pc_dev,
|
p->pc_sel.pc_bus, p->pc_sel.pc_dev,
|
||||||
p->pc_sel.pc_func, (p->pc_class << 16) |
|
p->pc_sel.pc_func, (p->pc_class << 16) |
|
||||||
|
Loading…
Reference in New Issue
Block a user