From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 5 Oct 2018 20:56:20 +0000 (+0200)
Subject: nspawn: merge two variable declaration lines
X-Git-Tag: v240~372^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df61bc5e4aa19f9b211dbe8414343b44361e442c;p=thirdparty%2Fsystemd.git

nspawn: merge two variable declaration lines
---

diff --git a/src/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c
index e459cb63ec9..0d45cce66e6 100644
--- a/src/nspawn/nspawn-register.c
+++ b/src/nspawn/nspawn-register.c
@@ -236,9 +236,8 @@ int allocate_scope(
                 int kill_signal,
                 char **properties) {
 
+        _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL, *reply = NULL;
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
-        _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
-        _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         _cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *w = NULL;
         _cleanup_free_ char *scope = NULL;
         const char *description, *object;