[systemd-commits] src/bus-proxyd src/login src/machine src/nspawn src/tmpfiles

[Thomas H.P. Andersen]

 src/bus-proxyd/driver.c  |    2 --
 src/login/logind-dbus.c  |    3 ---
 src/machine/machinectl.c |    1 -
 src/nspawn/nspawn.c      |    1 -
 src/tmpfiles/tmpfiles.c  |    3 +--
 5 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit fed6df828d86c053a96d5b50af75c53eb8dd4666
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Mon Feb 2 22:56:44 2015 +0100

    remove unused variables

diff --git a/src/bus-proxyd/driver.c b/src/bus-proxyd/driver.c
index 5287ff1..6a72d18 100644
--- a/src/bus-proxyd/driver.c
+++ b/src/bus-proxyd/driver.c
@@ -434,8 +434,6 @@ int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPoli
                 return synthetic_reply_method_return(m, "u", BUS_NAME_RELEASED);
 
         } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "ReloadConfig")) {
-                _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
-
                 if (!sd_bus_message_has_signature(m, ""))
                         return synthetic_reply_method_error(m, &SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_INVALID_ARGS, "Invalid parameters"));
 
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index f2f91d5..c7c1559 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -216,7 +216,6 @@ static int property_get_preparing(
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_handle_action, handle_action, HandleAction);
 
 static int method_get_session(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
         _cleanup_free_ char *p = NULL;
         Manager *m = userdata;
         const char *name;
@@ -939,7 +938,6 @@ static int method_lock_sessions(sd_bus *bus, sd_bus_message *message, void *user
 }
 
 static int method_kill_session(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
         const char *name, *swho;
         Manager *m = userdata;
         Session *session;
@@ -1007,7 +1005,6 @@ static int method_kill_user(sd_bus *bus, sd_bus_message *message, void *userdata
 }
 
 static int method_terminate_session(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
         Manager *m = userdata;
         const char *name;
         Session *session;
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 071b2b9..06ae8bc 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -1995,7 +1995,6 @@ static int pull_raw(int argc, char *argv[], void *userdata) {
 
 static int pull_dkr(int argc, char *argv[], void *userdata) {
         _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
-        _cleanup_free_ char *l = NULL, *ll = NULL;
         const char *local, *remote, *tag;
         sd_bus *bus = userdata;
         int r;
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 2beb810..226c441 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3610,7 +3610,6 @@ int main(int argc, char *argv[]) {
                 }
 
                 if (arg_ephemeral) {
-                        _cleanup_release_lock_file_ LockFile original_lock = LOCK_FILE_INIT;
                         char *np;
 
                         /* If the specified path is a mount point we
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 930b9a6..443851a 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -630,7 +630,7 @@ static int get_xattrs_from_arg(Item *i) {
 
         while ((r = unquote_first_word(&p, &xattr, false)) > 0) {
                 _cleanup_free_ char *tmp = NULL, *name = NULL,
-                        *value = NULL, *value2 = NULL, *_xattr = xattr;
+                        *value = NULL, *value2 = NULL;
 
                 r = split_pair(xattr, "=", &name, &value);
                 if (r < 0) {
@@ -682,7 +682,6 @@ static int path_set_xattrs(Item *i, const char *path) {
 static int get_acls_from_arg(Item *item) {
 #ifdef HAVE_ACL
         int r;
-        _cleanup_(acl_freep) acl_t a = NULL, d = NULL;
 
         assert(item);