summaryrefslogtreecommitdiff
path: root/src/udev/udev-event.c
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-03-13 18:43:00 +0100
committerAnthony G. Basile <blueness@gentoo.org>2015-03-18 20:55:21 -0400
commit89fe48ab026869f8b76a3b6a7ea89f0d5c772b31 (patch)
treeb30c2e223ad9777b4ec7a4fc8afe432068f0f326 /src/udev/udev-event.c
parent35ef251e168ba03f395d04394b88fdb2fa437ea9 (diff)
udev: make set_usec_initialized() internal to libudev
Instead introduce ensure_usec_initialized(), which copies the timestamp if possible otherwise sets it to now(CLOCK_MONOTONIC). Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/udev/udev-event.c')
-rw-r--r--src/udev/udev-event.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 7a6b55cf07..d4971cd18e 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -891,10 +891,7 @@ void udev_event_execute_rules(struct udev_event *event,
}
/* preserve old, or get new initialization timestamp */
- if (event->dev_db != NULL && udev_device_get_usec_initialized(event->dev_db) > 0)
- udev_device_set_usec_initialized(event->dev, udev_device_get_usec_initialized(event->dev_db));
- else if (udev_device_get_usec_initialized(event->dev) == 0)
- udev_device_set_usec_initialized(event->dev, now(CLOCK_MONOTONIC));
+ udev_device_ensure_usec_initialized(event->dev, event->dev_db);
/* (re)write database file */
udev_device_update_db(dev);