From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 3 Jun 2016 12:41:28 +0000 (+0200)
Subject: udevProcessSCSIHost: use STRSKIP
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3775a2e174a576e76990e8f5e70d2ee235c6c895;p=libvirt.git

udevProcessSCSIHost: use STRSKIP

Instead of separating it into STRPEFIX and str + strlen.
---

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 59bc452c00..7d111c416f 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -712,16 +712,17 @@ static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED,
     int ret = -1;
     virNodeDevCapDataPtr data = &def->caps->data;
     char *filename = NULL;
+    char *str;
 
     filename = last_component(def->sysfs_path);
 
-    if (!STRPREFIX(filename, "host")) {
+    if (!(str = STRSKIP(filename, "host"))) {
         VIR_ERROR(_("SCSI host found, but its udev name '%s' does "
                     "not begin with 'host'"), filename);
         goto out;
     }
 
-    if (udevStrToLong_ui(filename + strlen("host"),
+    if (udevStrToLong_ui(str,
                          NULL,
                          0,
                          &data->scsi_host.host) == -1) {