chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix return value on OOM
[elogind.git]
/
src
/
core
/
locale-setup.c
diff --git
a/src/core/locale-setup.c
b/src/core/locale-setup.c
index 4264ec87511c8d12bf9a496a4fa4dc9d701f8ec8..108072ca9fb45b04aca2a2133ccb47ad1de3bc9a 100644
(file)
--- a/
src/core/locale-setup.c
+++ b/
src/core/locale-setup.c
@@
-19,13
+19,11
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <string.h>
#include <stdlib.h>
#include <errno.h>
#include "locale-setup.h"
#include "util.h"
#include <stdlib.h>
#include <errno.h>
#include "locale-setup.h"
#include "util.h"
-#include "macro.h"
#include "virt.h"
#include "fileio.h"
#include "strv.h"
#include "virt.h"
#include "fileio.h"
#include "strv.h"
@@
-56,7
+54,7
@@
int locale_setup(char ***environment) {
NULL);
if (r < 0 && r != -ENOENT)
NULL);
if (r < 0 && r != -ENOENT)
- log_warning_errno(
-
r, "Failed to read /proc/cmdline: %m");
+ log_warning_errno(r, "Failed to read /proc/cmdline: %m");
}
/* Hmm, nothing set on the kernel cmd line? Then let's
}
/* Hmm, nothing set on the kernel cmd line? Then let's
@@
-80,7
+78,7
@@
int locale_setup(char ***environment) {
NULL);
if (r < 0 && r != -ENOENT)
NULL);
if (r < 0 && r != -ENOENT)
- log_warning_errno(
-
r, "Failed to read /etc/locale.conf: %m");
+ log_warning_errno(r, "Failed to read /etc/locale.conf: %m");
}
add = NULL;
}
add = NULL;