From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 8 Nov 2018 08:43:21 +0000 (+0900)
Subject: udevd: rename event sources in struct event
X-Git-Tag: v240~282^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8f462b43536bd94b519ef04e75b480c46e3e20b;p=thirdparty%2Fsystemd.git

udevd: rename event sources in struct event
---

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index db7c187b9c8..58e3011fa39 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);
 }