shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-08 20:58:20 +03:00
Code

sd-device: shorten code a bit

Browse Source
This commit is contained in:
Yu Watanabe 2022-07-11 12:02:31 +02:00
parent 591c186f2f
commit 4eb5f1db44
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libsystemd/sd-device/sd-device.c
View File

@ -1603,11 +1603,10 @@ _public_ int sd_device_get_usec_initialized(sd_device *device, uint64_t *ret) {
assert_return(device, -EINVAL);
r = device_read_db(device);
r = sd_device_get_is_initialized(device);
if (r < 0)
return r;
if (!device->is_initialized)
if (r == 0)
return -EBUSY;
if (device->usec_initialized == 0)
@ -1619,29 +1618,24 @@ _public_ int sd_device_get_usec_initialized(sd_device *device, uint64_t *ret) {
return 0;
}
_public_ int sd_device_get_usec_since_initialized(sd_device *device, uint64_t *usec) {
usec_t now_ts;
_public_ int sd_device_get_usec_since_initialized(sd_device *device, uint64_t *ret) {
usec_t now_ts, ts;
int r;
assert_return(device, -EINVAL);
r = device_read_db(device);
r = sd_device_get_usec_initialized(device, &ts);
if (r < 0)
return r;
if (!device->is_initialized)
return -EBUSY;
if (device->usec_initialized == 0)
return -ENODATA;
now_ts = now(CLOCK_MONOTONIC);
if (now_ts < device->usec_initialized)
if (now_ts < ts)
return -EIO;
if (usec)
*usec = now_ts - device->usec_initialized;
if (ret)
*ret = usec_sub_unsigned(now_ts, ts);
return 0;
}

4
src/systemd/sd-device.h
View File

@ -85,8 +85,8 @@ int sd_device_get_seqnum(sd_device *device, uint64_t *ret);
int sd_device_get_diskseq(sd_device *device, uint64_t *ret);
int sd_device_get_is_initialized(sd_device *device);
int sd_device_get_usec_initialized(sd_device *device, uint64_t *usec);
int sd_device_get_usec_since_initialized(sd_device *device, uint64_t *usec);
int sd_device_get_usec_initialized(sd_device *device, uint64_t *ret);
int sd_device_get_usec_since_initialized(sd_device *device, uint64_t *ret);
const char *sd_device_get_tag_first(sd_device *device);
const char *sd_device_get_tag_next(sd_device *device);