picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libudev: use device_get_seqnum() and device_get_action()

Browse source
This commit is contained in:
Yu Watanabe 2019-03-09 11:07:26 +09:00
parent 91bd2c349b
commit 40769ccc73
1 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/libudev/libudev-device.c
View file

@ -45,24 +45,15 @@
* *
* Returns: the kernel event sequence number, or 0 if there is no sequence number available. * Returns: the kernel event sequence number, or 0 if there is no sequence number available.
**/ **/
_public_ unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device) { _public_ unsigned long long udev_device_get_seqnum(struct udev_device *udev_device) {
const char *seqnum; uint64_t seqnum;
unsigned long long ret;
int r;
assert_return_errno(udev_device, 0, EINVAL); assert_return_errno(udev_device, 0, EINVAL);
r = sd_device_get_property_value(udev_device->device, "SEQNUM", &seqnum); if (device_get_seqnum(udev_device->device, &seqnum) < 0)
if (r == -ENOENT)
return 0; return 0;
else if (r < 0)
return_with_errno(0, r);
r = safe_atollu(seqnum, &ret); return seqnum;
if (r < 0)
return_with_errno(0, r);
return ret;
} }
/** /**
@ -652,18 +643,14 @@ _public_ struct udev_list_entry *udev_device_get_properties_list_entry(struct ud
* Returns: the kernel action value, or #NULL if there is no action value available. * Returns: the kernel action value, or #NULL if there is no action value available.
**/ **/
_public_ const char *udev_device_get_action(struct udev_device *udev_device) { _public_ const char *udev_device_get_action(struct udev_device *udev_device) {
const char *action; DeviceAction action;
int r;
assert_return_errno(udev_device, NULL, EINVAL); assert_return_errno(udev_device, NULL, EINVAL);
r = sd_device_get_property_value(udev_device->device, "ACTION", &action); if (device_get_action(udev_device->device, &action) < 0)
if (r == -ENOENT)
return NULL; return NULL;
if (r < 0)
return_with_errno(NULL, r);
return action; return device_action_to_string(action);
} }
/** /**