resolve: merge variable declaration with same type

diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index ba525e30f2624fd2750f0370a39bdcdede958951..8207a0419674955a0ac724f1861f40c6d329b52a 100644 (file)
--- 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 6ed55035b82f1c7a66956b7e2a8757aa8e6d63d0..9c2594c1ba01b5ab15aff060fd2b9e636a0ac4ea 100644 (file)
--- 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);