[systemd-commits] src/activate src/locale src/login src/systemctl src/timedate

[Thomas H.P. Andersen]

 src/activate/activate.c    |    1 -
 src/locale/localectl.c     |    3 ---
 src/login/pam-module.c     |    1 -
 src/systemctl/systemctl.c  |    3 ---
 src/timedate/timedatectl.c |    1 -
 5 files changed, 9 deletions(-)

New commits:
commit d5d217eae1b3ba978c4ddd6a2ef2de4621329662
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Mon Nov 18 22:57:56 2013 +0100

    remove unused variables

diff --git a/src/activate/activate.c b/src/activate/activate.c
index 2639d1c..5263969 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -58,7 +58,6 @@ static int add_epoll(int epoll_fd, int fd) {
 }
 
 static int make_socket_fd(const char* address, int flags) {
-        _cleanup_free_ char *p = NULL;
         SocketAddress a;
         int fd, r;
 
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index d8dd66a..f7fea48 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -139,7 +139,6 @@ fail:
 
 static int set_locale(sd_bus *bus, char **args, unsigned n) {
         _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
-        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         int r;
 
@@ -365,7 +364,6 @@ static int list_locales(sd_bus *bus, char **args, unsigned n) {
 }
 
 static int set_vconsole_keymap(sd_bus *bus, char **args, unsigned n) {
-        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         const char *map, *toggle_map;
         int r;
@@ -472,7 +470,6 @@ static int list_vconsole_keymaps(sd_bus *bus, char **args, unsigned n) {
 }
 
 static int set_x11_keymap(sd_bus *bus, char **args, unsigned n) {
-        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         const char *layout, *model, *variant, *options;
         int r;
diff --git a/src/login/pam-module.c b/src/login/pam-module.c
index 1975d80..c04622c 100644
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -440,7 +440,6 @@ _public_ PAM_EXTERN int pam_sm_close_session(
                 int argc, const char **argv) {
 
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
-        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         _cleanup_bus_unref_ sd_bus *bus = NULL;
         const void *p = NULL, *existing = NULL;
         const char *id;
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 737cd67..2362f43 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -750,7 +750,6 @@ static int get_next_elapse(
                 dual_timestamp *next) {
 
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
-        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         dual_timestamp t;
         int r;
 
@@ -2127,7 +2126,6 @@ static int reboot_with_logind(sd_bus *bus, enum action a) {
 
 static int check_inhibitors(sd_bus *bus, enum action a) {
 #ifdef HAVE_LOGIND
-        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         _cleanup_strv_free_ char **sessions = NULL;
         const char *what, *who, *why, *mode;
@@ -3542,7 +3540,6 @@ static int show_all(
                 bool *new_line,
                 bool *ellipsized) {
 
-        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         _cleanup_free_ UnitInfo *unit_infos = NULL;
         const UnitInfo *u;
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 2267733..6a36af0 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -194,7 +194,6 @@ static void print_status_info(const StatusInfo *i) {
 }
 
 static int show_status(sd_bus *bus, char **args, unsigned n) {
-        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         StatusInfo info = {};
         static const struct bus_properties_map map[]  = {
                 { "Timezone",        "s", NULL, offsetof(StatusInfo, timezone) },