External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 03:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

udevProcessSCSIHost: use STRSKIP

Browse Source 
Instead of separating it into STRPEFIX and str + strlen.
This commit is contained in:
Ján Tomko 2016-06-03 14:41:28 +02:00
parent 170c68c4a8
commit 3775a2e174
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/node_device/node_device_udev.c
View File

@ -712,16 +712,17 @@ static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED,
int ret = -1; int ret = -1;
virNodeDevCapDataPtr data = &def->caps->data; virNodeDevCapDataPtr data = &def->caps->data;
char *filename = NULL; char *filename = NULL;
char *str;
filename = last_component(def->sysfs_path); 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 " VIR_ERROR(_("SCSI host found, but its udev name '%s' does "
"not begin with 'host'"), filename); "not begin with 'host'"), filename);
goto out; goto out;
} }
if (udevStrToLong_ui(filename + strlen("host"), if (udevStrToLong_ui(str,
NULL, NULL,
0, 0,
&data->scsi_host.host) == -1) { &data->scsi_host.host) == -1) {