Remove src/libudev

[elogind.git] / src / locale / localectl.c

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 3690f9fc892c5037a15a42a09eb3e2f537291e3e..515fca540aa3a3f465624c1b57854728c96d9875 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -23,25 +23,19 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <locale.h>
 #include <stdlib.h>
 #include <stdbool.h>

-#include <unistd.h>

 #include <getopt.h>
 #include <string.h>
 #include <ftw.h>
 #include <getopt.h>
 #include <string.h>
 #include <ftw.h>

-#include <sys/mman.h>
-#include <fcntl.h>

 
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "bus-error.h"
 
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "bus-error.h"

-#include "bus-message.h"

 #include "util.h"
 #include "spawn-polkit-agent.h"
 #include "build.h"
 #include "strv.h"
 #include "pager.h"
 #include "set.h"
 #include "util.h"
 #include "spawn-polkit-agent.h"
 #include "build.h"
 #include "strv.h"
 #include "pager.h"
 #include "set.h"

-#include "path-util.h"
-#include "utf8.h"

 #include "def.h"
 #include "virt.h"
 #include "fileio.h"
 #include "def.h"
 #include "virt.h"
 #include "fileio.h"


@@ -110,7 +104,7 @@ static void print_overriden_variables(void) {
                            NULL);
 
         if (r < 0 && r != -ENOENT) {
                            NULL);
 
         if (r < 0 && r != -ENOENT) {

-                log_warning("Failed to read /proc/cmdline: %s", strerror(-r));
+                log_warning_errno(r, "Failed to read /proc/cmdline: %m");

                 goto finish;
         }
 
                 goto finish;
         }
 


@@ -118,11 +112,11 @@ static void print_overriden_variables(void) {
                 if (variables[j]) {
                         if (print_warning) {
                                 log_warning("Warning: Settings on kernel command line override system locale settings in /etc/locale.conf.\n"
                 if (variables[j]) {
                         if (print_warning) {
                                 log_warning("Warning: Settings on kernel command line override system locale settings in /etc/locale.conf.\n"

-                                            "  Command Line: %s=%s\n", locale_variable_to_string(j), variables[j]);
+                                            "  Command Line: %s=%s", locale_variable_to_string(j), variables[j]);

 
                                 print_warning = false;
                         } else
 
                                 print_warning = false;
                         } else

-                                log_warning("                %s=%s\n", locale_variable_to_string(j), variables[j]);
+                                log_warning("                %s=%s", locale_variable_to_string(j), variables[j]);

                 }
  finish:
         for (j = 0; j < _VARIABLE_LC_MAX; j++)
                 }
  finish:
         for (j = 0; j < _VARIABLE_LC_MAX; j++)


@@ -178,7 +172,7 @@ static int show_status(sd_bus *bus, char **args, unsigned n) {
                                    map,
                                    &info);
         if (r < 0) {
                                    map,
                                    &info);
         if (r < 0) {

-                log_error("Could not get properties: %s", strerror(-r));
+                log_error_errno(r, "Could not get properties: %m");

                 goto fail;
         }
 
                 goto fail;
         }
 


@@ -234,10 +228,8 @@ static int list_locales(sd_bus *bus, char **args, unsigned n) {
         assert(args);
 
         r = get_locales(&l);
         assert(args);
 
         r = get_locales(&l);

-        if (r < 0) {
-                log_error("Failed to read list of locales: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to read list of locales: %m");

 
         pager_open_if_enabled();
         strv_print(l);
 
         pager_open_if_enabled();
         strv_print(l);


@@ -309,10 +301,8 @@ static int nftw_cb(
                 *e = 0;
 
         r = set_consume(keymaps, p);
                 *e = 0;
 
         r = set_consume(keymaps, p);

-        if (r < 0 && r != -EEXIST) {
-                log_error("Can't add keymap: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0 && r != -EEXIST)
+                return log_error_errno(r, "Can't add keymap: %m");

 
         return 0;
 }
 
         return 0;
 }


@@ -405,10 +395,8 @@ static int list_x11_keymaps(sd_bus *bus, char **args, unsigned n) {
         }
 
         f = fopen("/usr/share/X11/xkb/rules/base.lst", "re");
         }
 
         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;
 
         if (streq(args[0], "list-x11-keymap-models"))
                 look_for = MODELS;


@@ -503,10 +491,10 @@ static void help(void) {
                "  status                   Show current locale settings\n"
                "  set-locale LOCALE...     Set system locale\n"
                "  list-locales             Show known locales\n"
                "  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"
                "  list-keymaps             Show known virtual console keyboard mappings\n"

-               "  set-x11-keymap LAYOUT [MODEL] [VARIANT] [OPTIONS]\n"
-               "                           Set X11 keyboard mapping\n"
+               "  set-x11-keymap LAYOUT [MODEL [VARIANT [OPTIONS]]]\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"
                "  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 +559,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 'M':
                         break;
 
                 case 'M':

-                        arg_transport = BUS_TRANSPORT_CONTAINER;
+                        arg_transport = BUS_TRANSPORT_MACHINE;

                         arg_host = optarg;
                         break;
 
                         arg_host = optarg;
                         break;
 


@@ -683,7 +671,7 @@ int main(int argc, char*argv[]) {
 
         r = bus_open_transport(arg_transport, arg_host, false, &bus);
         if (r < 0) {
 
         r = bus_open_transport(arg_transport, arg_host, false, &bus);
         if (r < 0) {

-                log_error("Failed to create bus connection: %s", strerror(-r));
+                log_error_errno(r, "Failed to create bus connection: %m");

                 goto finish;
         }
 
                 goto finish;
         }