X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flocale%2Flocalectl.c;h=f7fea48ffeae642b5eba95688c2f2b19a5ea0e7b;hb=4561be3a64534a911ee405ffb51950a624a0cd3f;hp=748a14841d1449b08d00a99aa08525a24623799f;hpb=46e65dcc3a522b5e992e165b5e61d14254026859;p=elogind.git

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 748a14841..f7fea48ff 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;
 
@@ -154,17 +153,17 @@ static int set_locale(sd_bus *bus, char **args, unsigned n) {
                         "org.freedesktop.locale1",
                         "SetLocale", &m);
         if (r < 0)
-                return r;
+                return bus_log_create_error(r);
 
         r = sd_bus_message_append_strv(m, args + 1);
         if (r < 0)
-                return r;
+                return bus_log_create_error(r);
 
         r = sd_bus_message_append(m, "b", arg_ask_password);
         if (r < 0)
-                return r;
+                return bus_log_create_error(r);
 
-        r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, NULL);
+        r = sd_bus_call(bus, m, 0, &error, NULL);
         if (r < 0) {
                 log_error("Failed to issue method call: %s", bus_error_message(&error, -r));
                 return 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;
@@ -617,11 +614,11 @@ static int help(void) {
                "Query or change system locale and keyboard settings.\n\n"
                "  -h --help                Show this help\n"
                "     --version             Show package version\n"
-               "     --no-convert          Don't convert keyboard mappings\n"
                "     --no-pager            Do not pipe output into a pager\n"
                "     --no-ask-password     Do not prompt for password\n"
                "  -H --host=[USER@]HOST    Operate on remote host\n"
-               "  -M --machine=CONTAINER   Operate on local container\n\n"
+               "  -M --machine=CONTAINER   Operate on local container\n"
+               "     --no-convert          Don't convert keyboard mappings\n\n"
                "Commands:\n"
                "  status                   Show current locale settings\n"
                "  set-locale LOCALE...     Set system locale\n"