summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-11-08 17:43:21 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-11-17 21:45:03 +0900
commitd8f462b43536bd94b519ef04e75b480c46e3e20b (patch)
tree2813e30250cf5952a0b6755f56b5ecf63342180e /src
parentdc7faf2a6fd8667cd1b83daa97753ddfc3f0e451 (diff)
downloadsystemd-d8f462b43536bd94b519ef04e75b480c46e3e20b.tar.gz
systemd-d8f462b43536bd94b519ef04e75b480c46e3e20b.tar.bz2
systemd-d8f462b43536bd94b519ef04e75b480c46e3e20b.zip
udevd: rename event sources in struct event
Diffstat (limited to 'src')
-rw-r--r--src/udev/udevd.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index db7c187b9c..58e3011fa3 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -120,8 +120,9 @@ struct event {
dev_t devnum;
int ifindex;
bool is_block;
- sd_event_source *timeout_warning;
- sd_event_source *timeout;
+
+ sd_event_source *timeout_warning_event;
+ sd_event_source *timeout_event;
};
static void event_queue_cleanup(Manager *manager, enum event_state type);
@@ -156,8 +157,8 @@ static void event_free(struct event *event) {
udev_device_unref(event->dev);
udev_device_unref(event->dev_kernel);
- sd_event_source_unref(event->timeout_warning);
- sd_event_source_unref(event->timeout);
+ sd_event_source_unref(event->timeout_warning_event);
+ sd_event_source_unref(event->timeout_event);
if (event->worker)
event->worker->event = NULL;
@@ -274,10 +275,10 @@ static void worker_attach_event(struct worker *worker, struct event *event) {
assert_se(sd_event_now(e, CLOCK_MONOTONIC, &usec) >= 0);
- (void) sd_event_add_time(e, &event->timeout_warning, CLOCK_MONOTONIC,
+ (void) sd_event_add_time(e, &event->timeout_warning_event, CLOCK_MONOTONIC,
usec + udev_warn_timeout(arg_event_timeout_usec), USEC_PER_SEC, on_event_timeout_warning, event);
- (void) sd_event_add_time(e, &event->timeout, CLOCK_MONOTONIC,
+ (void) sd_event_add_time(e, &event->timeout_event, CLOCK_MONOTONIC,
usec + arg_event_timeout_usec, USEC_PER_SEC, on_event_timeout, event);
}