From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 4 Sep 2020 04:01:15 +0000 (+0900)
Subject: resolve: rename dns_stub_extra_event_source -> event_source
X-Git-Tag: v247-rc1~292^2~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ae07803a03557971729a4115e3df37ea61cfc54;p=thirdparty%2Fsystemd.git

resolve: rename dns_stub_extra_event_source -> event_source

As the name is too redundant.
---

diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c
index d3999ea0a33..f9087a379fb 100644
--- a/src/resolve/resolved-dns-stub.c
+++ b/src/resolve/resolved-dns-stub.c
@@ -483,11 +483,11 @@ static int manager_dns_stub_udp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
                 goto fail;
         }
 
-        r = sd_event_add_io(m->event, &l->dns_stub_extra_event_source, fd, EPOLLIN, on_dns_stub_packet, m);
+        r = sd_event_add_io(m->event, &l->event_source, fd, EPOLLIN, on_dns_stub_packet, m);
         if (r < 0)
                 goto fail;
 
-        (void) sd_event_source_set_description(l->dns_stub_extra_event_source, "dns-stub-udp-extra");
+        (void) sd_event_source_set_description(l->event_source, "dns-stub-udp-extra");
 
         l->fd = TAKE_FD(fd);
 
@@ -639,11 +639,11 @@ static int manager_dns_stub_tcp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
                 goto fail;
         }
 
-        r = sd_event_add_io(m->event, &l->dns_stub_extra_event_source, fd, EPOLLIN, on_dns_stub_packet, m);
+        r = sd_event_add_io(m->event, &l->event_source, fd, EPOLLIN, on_dns_stub_packet, m);
         if (r < 0)
                 goto fail;
 
-        (void) sd_event_source_set_description(l->dns_stub_extra_event_source, "dns-stub-tcp-extra");
+        (void) sd_event_source_set_description(l->event_source, "dns-stub-tcp-extra");
 
         l->fd = TAKE_FD(fd);
 
@@ -742,7 +742,7 @@ void manager_dns_stub_stop_extra(Manager *m) {
         assert(m);
 
         ORDERED_SET_FOREACH(l, m->dns_extra_stub_listeners, i) {
-                l->dns_stub_extra_event_source = sd_event_source_unref(l->dns_stub_extra_event_source);
+                l->event_source = sd_event_source_unref(l->event_source);
                 l->fd = safe_close(l->fd);
         }
 }
diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h
index a3a2e08123c..f31557a8a3b 100644
--- a/src/resolve/resolved-manager.h
+++ b/src/resolve/resolved-manager.h
@@ -36,7 +36,7 @@ typedef struct DNSStubListenerExtra {
 
         DnsStubListenerMode mode;
         SocketAddress address;
-        sd_event_source *dns_stub_extra_event_source;
+        sd_event_source *event_source;
 } DNSStubListenerExtra;
 
 struct Manager {