From 4e2744fcb579f5314043c0045e6902c64b7efe67 Mon Sep 17 00:00:00 2001
From: Ronny Chevalier <chevalier.ronny@gmail.com>
Date: Sun, 30 Nov 2014 02:33:35 +0100
Subject: [PATCH 1/1] core: remove unused variables

---
 src/core/load-fragment.c | 2 --
 src/core/scope.c         | 7 +++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 430912164..64f7fa6d7 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -2487,7 +2487,6 @@ int config_parse_address_families(
                 void *userdata) {
 
         ExecContext *c = data;
-        Unit *u = userdata;
         bool invert = false;
         const char *word, *state;
         size_t l;
@@ -2496,7 +2495,6 @@ int config_parse_address_families(
         assert(filename);
         assert(lvalue);
         assert(rvalue);
-        assert(u);
 
         if (isempty(rvalue)) {
                 /* Empty assignment resets the list */
diff --git a/src/core/scope.c b/src/core/scope.c
index d33b89195..f0efec051 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -382,15 +382,14 @@ static int scope_deserialize_item(Unit *u, const char *key, const char *value, F
 }
 
 static bool scope_check_gc(Unit *u) {
-        Scope *s = SCOPE(u);
-        int r;
-
-        assert(s);
+        assert(u);
 
         /* Never clean up scopes that still have a process around,
          * even if the scope is formally dead. */
 
         if (u->cgroup_path) {
+                int r;
+
                 r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, true);
                 if (r <= 0)
                         return true;
-- 
2.30.2