From: John Ferlan <jferlan@redhat.com>
Date: Mon, 9 Oct 2017 22:01:57 +0000 (-0400)
Subject: nodedev: Convert virNodeDeviceObjHasCap to bool
X-Git-Tag: CVE-2017-1000256~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6efd7291538118973bcfe731e4a291157119c6a;p=thirdparty%2Flibvirt.git

nodedev: Convert virNodeDeviceObjHasCap to bool

It only returns 0 or 1 anyway, let's be realistic

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 49f4f436b8..7db8fccbc3 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -120,7 +120,7 @@ virNodeDeviceObjGetDef(virNodeDeviceObjPtr obj)
 }
 
 
-static int
+static bool
 virNodeDeviceObjHasCap(const virNodeDeviceObj *obj,
                        const char *cap)
 {
@@ -134,13 +134,13 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj,
 
     while (caps) {
         if (STREQ(cap, virNodeDevCapTypeToString(caps->data.type))) {
-            return 1;
+            return true;
         } else {
             switch (caps->data.type) {
             case VIR_NODE_DEV_CAP_PCI_DEV:
                 if ((STREQ(cap, mdev_types)) &&
                     (caps->data.pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCI_MDEV))
-                    return 1;
+                    return true;
                 break;
 
             case VIR_NODE_DEV_CAP_SCSI_HOST:
@@ -148,7 +148,7 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj,
                     (caps->data.scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST)) ||
                     (STREQ(cap, vports_cap) &&
                     (caps->data.scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS)))
-                    return 1;
+                    return true;
                 break;
 
             case VIR_NODE_DEV_CAP_SYSTEM:
@@ -172,7 +172,7 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj,
 
         caps = caps->next;
     }
-    return 0;
+    return false;
 }