udevProcessSCSIHost: use STRSKIP

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

View File

@ -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) {