X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flocale%2Flocalectl.c;h=41a88a828c2cbdd81d04b3f923beb996ea09ccf8;hp=211808b03e935a17da17ccb2d076b65cb40e6b8e;hb=de33fc625725d199629ed074d6278504deb23deb;hpb=ff49bc3212cb07d850dcfd59940539773a0be26f

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 211808b03..41a88a828 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -234,10 +234,8 @@ static int list_locales(sd_bus *bus, char **args, unsigned n) {
         assert(args);
 
         r = get_locales(&l);
-        if (r < 0) {
-                log_error_errno(r, "Failed to read list of locales: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to read list of locales: %m");
 
         pager_open_if_enabled();
         strv_print(l);
@@ -309,10 +307,8 @@ static int nftw_cb(
                 *e = 0;
 
         r = set_consume(keymaps, p);
-        if (r < 0 && r != -EEXIST) {
-                log_error_errno(r, "Can't add keymap: %m");
-                return r;
-        }
+        if (r < 0 && r != -EEXIST)
+                return log_error_errno(r, "Can't add keymap: %m");
 
         return 0;
 }
@@ -405,10 +401,8 @@ static int list_x11_keymaps(sd_bus *bus, char **args, unsigned n) {
         }
 
         f = fopen("/usr/share/X11/xkb/rules/base.lst", "re");
-        if (!f) {
-                log_error("Failed to open keyboard mapping list. %m");
-                return -errno;
-        }
+        if (!f)
+                return log_error_errno(errno, "Failed to open keyboard mapping list. %m");
 
         if (streq(args[0], "list-x11-keymap-models"))
                 look_for = MODELS;
@@ -503,10 +497,10 @@ static void help(void) {
                "  status                   Show current locale settings\n"
                "  set-locale LOCALE...     Set system locale\n"
                "  list-locales             Show known locales\n"
-               "  set-keymap MAP [MAP]     Set virtual console keyboard mapping\n"
+               "  set-keymap MAP [MAP]     Set console and X11 keyboard mappings\n"
                "  list-keymaps             Show known virtual console keyboard mappings\n"
                "  set-x11-keymap LAYOUT [MODEL [VARIANT [OPTIONS]]]\n"
-               "                           Set X11 keyboard mapping\n"
+               "                           Set X11 and console keyboard mappings\n"
                "  list-x11-keymap-models   Show known X11 keyboard mapping models\n"
                "  list-x11-keymap-layouts  Show known X11 keyboard mapping layouts\n"
                "  list-x11-keymap-variants [LAYOUT]\n"
@@ -571,7 +565,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 'M':
-                        arg_transport = BUS_TRANSPORT_CONTAINER;
+                        arg_transport = BUS_TRANSPORT_MACHINE;
                         arg_host = optarg;
                         break;