External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 22:25:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove udevStrToLong_ull

Browse Source 
The wrapper adds an error message or a debug log.

Since we already log the properties we get from udev as strings,
there is no much use for the debug logs.

Open code the error message and delete the function.
This commit is contained in:
Ján Tomko 2016-06-03 13:56:09 +02:00
parent 876a5da03e
commit 1a97fb16ae
1 changed files with 3 additions and 18 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

@ -57,23 +57,6 @@ struct _udevPrivate {
bool privileged; bool privileged;
}; };
static int udevStrToLong_ull(char const *s,
char **end_ptr,
int base,
unsigned long long *result)
{
int ret = 0;
ret = virStrToLong_ull(s, end_ptr, base, result);
if (ret != 0) {
VIR_ERROR(_("Failed to convert '%s' to unsigned long long"), s);
} else {
VIR_DEBUG("Converted '%s' to unsigned long %llu", s, *result);
}
return ret;
}
static int udevStrToLong_ui(char const *s, static int udevStrToLong_ui(char const *s,
char **end_ptr, char **end_ptr,
@ -300,9 +283,11 @@ static int udevGetUint64SysfsAttr(struct udev_device *udev_device,
ret = udevGetDeviceSysfsAttr(udev_device, attr_name, &udev_value); ret = udevGetDeviceSysfsAttr(udev_device, attr_name, &udev_value);
if (ret == PROPERTY_FOUND) { if (ret == PROPERTY_FOUND) {
if (udevStrToLong_ull(udev_value, NULL, 0, value) != 0) if (virStrToLong_ull(udev_value, NULL, 0, value) < 0) {
VIR_ERROR(_("Failed to convert '%s' to unsigned long long"), udev_value);
ret = PROPERTY_ERROR; ret = PROPERTY_ERROR;
} }
}
VIR_FREE(udev_value); VIR_FREE(udev_value);
return ret; return ret;