From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 1 Nov 2017 21:32:22 +0000 (+0100)
Subject: Remove a bunch of unused variables
X-Git-Tag: v236~270^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac097c841e05bcc96da7f369682b56164671eec8;p=thirdparty%2Fsystemd.git

Remove a bunch of unused variables

gcc does not warn about those, because of the _cleanup_ usage.
clang is smarter here.
---

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 28c8c35fe0f..fdf2b098f61 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -245,7 +245,6 @@ int ask_string(char **ret, const char *text, ...) {
 
 int reset_terminal_fd(int fd, bool switch_to_text) {
         struct termios termios;
-        _cleanup_free_ char *utf8 = NULL;
         int r = 0;
 
         /* Set terminal to some sane defaults */
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 26c6e039b85..4dbd6b0f6f9 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -1177,8 +1177,6 @@ int bus_exec_context_set_transient_property(
                         return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid personality");
 
                 if (mode != UNIT_CHECK) {
-                        _cleanup_free_ char *str = NULL;
-
                         c->personality = p;
                         unit_write_drop_in_private_format(u, mode, name, "%s=%s", name, s);
                 }
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index ae0a8da63a9..f9a0a14d9e1 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -56,7 +56,7 @@ static bool arg_root_enabled = true;
 static bool arg_root_rw = false;
 
 static int add_cryptsetup(const char *id, const char *what, bool rw, bool require, char **device) {
-        _cleanup_free_ char *e = NULL, *n = NULL, *p = NULL, *d = NULL, *to = NULL;
+        _cleanup_free_ char *e = NULL, *n = NULL, *p = NULL, *d = NULL;
         _cleanup_fclose_ FILE *f = NULL;
         char *ret;
         int r;
diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
index 6f0ca47df6b..2bb435b9760 100644
--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
@@ -228,7 +228,7 @@ int main(int argc, char *argv[]) {
         } mode = MODE_BISECT;
         Type type = TYPE_LEGACY;
         int i, pair[2] = { -1, -1 };
-        _cleanup_free_ char *name = NULL, *bus_name = NULL, *address = NULL, *server_name = NULL;
+        _cleanup_free_ char *address = NULL, *server_name = NULL;
         _cleanup_close_ int bus_ref = -1;
         const char *unique;
         cpu_set_t cpuset;
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 730acd2978d..db4dc45e05e 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -1136,7 +1136,6 @@ void session_restore_vt(Session *s) {
                 .mode = VT_AUTO,
         };
 
-        _cleanup_free_ char *utf8 = NULL;
         int vt, old_fd;
 
         /* We need to get a fresh handle to the virtual terminal,
diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c
index 6850135fc11..d37f31a4cf5 100644
--- a/src/network/networkd-routing-policy-rule.c
+++ b/src/network/networkd-routing-policy-rule.c
@@ -672,7 +672,6 @@ int config_parse_routing_policy_rule_fwmark_mask(
                 void *userdata) {
 
         _cleanup_routing_policy_rule_free_ RoutingPolicyRule *n = NULL;
-        _cleanup_free_ char *fwmark = NULL;
         Network *network = userdata;
         int r;
 
@@ -751,7 +750,7 @@ int config_parse_routing_policy_rule_prefix(
 }
 
 static int routing_policy_rule_read_full_file(char *state_file, char **ret) {
-        _cleanup_free_ char *s = NULL, *p = NULL;
+        _cleanup_free_ char *s = NULL;
         size_t size;
         int r;
 
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 802e4b9c8d8..26dbb482ef8 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -245,7 +245,6 @@ static int acquire_generator_dirs(
                 char **generator_early,
                 char **generator_late) {
 
-        _cleanup_(rmdir_and_freep) char *t = NULL;
         _cleanup_free_ char *x = NULL, *y = NULL, *z = NULL;
         const char *prefix;
 
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index 27495fa5be4..c78eb51b429 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -704,7 +704,6 @@ static void test_read_line_one_file(FILE *f) {
 
 static void test_read_line(void) {
         _cleanup_fclose_ FILE *f = NULL;
-        _cleanup_free_ char *line = NULL;
 
         f = fmemopen((void*) buffer, sizeof(buffer), "re");
         assert_se(f);