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;
}
- for (j = VARIABLE_LANG; j < _VARIABLE_LC_MAX; j++)
+ for (j = 0; j < _VARIABLE_LC_MAX; j++)
if (variables[j]) {
if (print_warning) {
- printf("Warning: Settings on Kernel Command Line override system locale settings in /etc/locale.conf\n");
- printf(" Command Line: %s=%s\n", locale_variable_to_string(j), variables[j]);
+ log_warning("Warning: Settings on kernel command line override system locale settings in /etc/locale.conf.\n"
+ " Command Line: %s=%s", locale_variable_to_string(j), variables[j]);
print_warning = false;
- continue;
- }
- printf(" %s=%s\n", locale_variable_to_string(j), variables[j]);
+ } else
+ log_warning(" %s=%s", locale_variable_to_string(j), variables[j]);
}
finish:
- for (j = VARIABLE_LANG; j < _VARIABLE_LC_MAX; j++)
+ for (j = 0; j < _VARIABLE_LC_MAX; j++)
free(variables[j]);
}
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;
}
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);
*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;
}
}
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;
" 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-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"
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;
}