chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: yet more log_*_errno + return simplifications
[elogind.git]
/
src
/
locale
/
localectl.c
diff --git
a/src/locale/localectl.c
b/src/locale/localectl.c
index 333b45847161b94d232da1d19ef76e2d12e9a2ce..cb2920974c8941f653fb6bb3bb3dc41032f1c9b6 100644
(file)
--- a/
src/locale/localectl.c
+++ b/
src/locale/localectl.c
@@
-118,11
+118,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++)
@@
-234,10
+234,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_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);
pager_open_if_enabled();
strv_print(l);
@@
-309,10
+307,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_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;
}
return 0;
}