daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
4bff0a
From 45085ba5ef810dc527f439fe165c5d393443bda9 Mon Sep 17 00:00:00 2001
4bff0a
From: Lennart Poettering <lennart@poettering.net>
4bff0a
Date: Fri, 5 Oct 2018 22:56:20 +0200
4bff0a
Subject: [PATCH] nspawn: merge two variable declaration lines
4bff0a
4bff0a
(cherry picked from commit df61bc5e4aa19f9b211dbe8414343b44361e442c)
4bff0a
4bff0a
Resolves: #1697893
4bff0a
---
4bff0a
 src/nspawn/nspawn-register.c | 3 +--
4bff0a
 1 file changed, 1 insertion(+), 2 deletions(-)
4bff0a
4bff0a
diff --git a/src/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c
4bff0a
index e459cb63ec..0d45cce66e 100644
4bff0a
--- a/src/nspawn/nspawn-register.c
4bff0a
+++ b/src/nspawn/nspawn-register.c
4bff0a
@@ -236,9 +236,8 @@ int allocate_scope(
4bff0a
                 int kill_signal,
4bff0a
                 char **properties) {
4bff0a
 
4bff0a
+        _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL, *reply = NULL;
4bff0a
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
4bff0a
-        _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
4bff0a
-        _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
4bff0a
         _cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *w = NULL;
4bff0a
         _cleanup_free_ char *scope = NULL;
4bff0a
         const char *description, *object;