From 4f6ebd43b2582603035f6631c2aede8693a06847 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 15 May 2022 10:26:24 +0900 Subject: [PATCH] resolve: merge variable declaration with same type --- src/resolve/resolved-bus.c | 6 ++---- src/resolve/resolved-dnssd.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index ba525e30f26..8207a041967 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -1899,12 +1899,10 @@ static int bus_method_register_service(sd_bus_message *message, void *userdata, _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL; _cleanup_(dnssd_service_freep) DnssdService *service = NULL; _cleanup_(sd_bus_track_unrefp) sd_bus_track *bus_track = NULL; + const char *name, *name_template, *type; _cleanup_free_ char *path = NULL; - Manager *m = userdata; DnssdService *s = NULL; - const char *name; - const char *name_template; - const char *type; + Manager *m = userdata; uid_t euid; int r; diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c index 6ed55035b82..9c2594c1ba0 100644 --- a/src/resolve/resolved-dnssd.c +++ b/src/resolve/resolved-dnssd.c @@ -207,9 +207,7 @@ int dnssd_load(Manager *manager) { } int dnssd_update_rrs(DnssdService *s) { - _cleanup_free_ char *n = NULL; - _cleanup_free_ char *service_name = NULL; - _cleanup_free_ char *full_name = NULL; + _cleanup_free_ char *n = NULL, *service_name = NULL, *full_name = NULL; int r; assert(s); -- 2.47.3