From 0aadc09b762cdbb2f0ed0a170b6bcd5c5d8eef4b Mon Sep 17 00:00:00 2001 From: Burt P Date: Fri, 26 Oct 2018 19:32:27 -0500 Subject: pci_util: minor fix (#298) E: hardinfo no-return-in-nonvoid-function /home/abuild/rpmbuild/BUILD/hardinfo-20181022T194523/hardinfo/pci_util.c:202, 160 Signed-off-by: Burt P --- hardinfo/pci_util.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hardinfo/pci_util.c b/hardinfo/pci_util.c index 40326da2..b04a6e5e 100644 --- a/hardinfo/pci_util.c +++ b/hardinfo/pci_util.c @@ -168,7 +168,8 @@ static gboolean pci_get_device_sysfs(uint32_t dom, uint32_t bus, uint32_t dev, u s->bus = bus; s->device = dev; s->function = func; - _sysfs_bus_pci_read_hex(dom, bus, dev, func, "class", &s->class); + if (! _sysfs_bus_pci_read_hex(dom, bus, dev, func, "class", &s->class) ) + return FALSE; s->class >>= 8; /* TODO: find out why */ _sysfs_bus_pci_read_hex(dom, bus, dev, func, "device", &s->device_id); _sysfs_bus_pci_read_hex(dom, bus, dev, func, "vendor", &s->vendor_id); @@ -198,7 +199,7 @@ static gboolean pci_get_device_sysfs(uint32_t dom, uint32_t bus, uint32_t dev, u s->pcie_width_curr = strtoul(tmp, NULL, 0); free(tmp); } - + return TRUE; } static gboolean pci_get_device_lspci(uint32_t dom, uint32_t bus, uint32_t dev, uint32_t func, pcid *s) { @@ -248,7 +249,7 @@ static gboolean pci_get_device_lspci(uint32_t dom, uint32_t bus, uint32_t dev, u pcid *pci_get_device(uint32_t dom, uint32_t bus, uint32_t dev, uint32_t func) { pcid *s = pcid_new(); - int ok = 0; + gboolean ok = FALSE; if (s) { ok = pci_get_device_sysfs(dom, bus, dev, func, s); ok |= pci_get_device_lspci(dom, bus, dev, func, s); -- cgit v1.2.3