svn commit: r277856 - head/usr.sbin/pciconf

[Dimitry Andric]

Author: dim
Date: Wed Jan 28 21:21:35 2015
New Revision: 277856
URL: https://svnweb.freebsd.org/changeset/base/277856

Log:
  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.

Modified:
  head/usr.sbin/pciconf/pciconf.c

Modified: head/usr.sbin/pciconf/pciconf.c
==============================================================================
--- head/usr.sbin/pciconf/pciconf.c	Wed Jan 28 21:08:09 2015	(r277855)
+++ head/usr.sbin/pciconf/pciconf.c	Wed Jan 28 21:21:35 2015	(r277856)
@@ -234,9 +234,9 @@ list_devs(const char *name, int verbose,
 		for (p = conf; p < &conf[pc.num_matches]; p++) {
 			printf("%s%d at pci%d:%d:%d:%d:\tclass=0x%06x card=0x%08x "
 			    "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",
-			    (p->pd_name && *p->pd_name) ? (int)p->pd_unit :
+			    *p->pd_name ? (int)p->pd_unit :
 			    none_count++, p->pc_sel.pc_domain,
 			    p->pc_sel.pc_bus, p->pc_sel.pc_dev,
 			    p->pc_sel.pc_func, (p->pc_class << 16) |