External/libvirt
1
0
Fork 0
Code

udevProcessStorage: trim all whitespace from model and vendor

Browse Source 
Use virTrimSpaces instead of a custom implementation.
This commit is contained in:
Ján Tomko 2016-06-03 19:33:05 +02:00
parent cc1d0e2a0e
commit e2859b9dcd
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/node_device/node_device_udev.c
View File

@ -839,20 +839,6 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def)
} }
static void udevStripSpaces(char *s)
{
if (s == NULL)
return;
while (virFileStripSuffix(s, " ")) {
/* do nothing */
;
}
return;
}
static int udevProcessStorage(struct udev_device *device, static int udevProcessStorage(struct udev_device *device,
virNodeDeviceDefPtr def) virNodeDeviceDefPtr def)
{ {
@ -876,10 +862,13 @@ static int udevProcessStorage(struct udev_device *device,
if (udevGetStringSysfsAttr(device, "device/vendor", &data->storage.vendor) < 0) if (udevGetStringSysfsAttr(device, "device/vendor", &data->storage.vendor) < 0)
goto out; goto out;
udevStripSpaces(def->caps->data.storage.vendor); if (def->caps->data.storage.vendor)
virTrimSpaces(def->caps->data.storage.vendor, NULL);
if (udevGetStringSysfsAttr(device, "device/model", &data->storage.model) < 0) if (udevGetStringSysfsAttr(device, "device/model", &data->storage.model) < 0)
goto out; goto out;
udevStripSpaces(def->caps->data.storage.model); if (def->caps->data.storage.model)
virTrimSpaces(def->caps->data.storage.model, NULL);
/* There is no equivalent of the hotpluggable property in libudev, /* There is no equivalent of the hotpluggable property in libudev,
* but storage is going toward a world in which hotpluggable is * but storage is going toward a world in which hotpluggable is
* expected, so I don't see a problem with not having a property * expected, so I don't see a problem with not having a property