diff options
Diffstat (limited to 'src/core/locale-setup.c')
| -rw-r--r-- | src/core/locale-setup.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c index 108072ca9f..ccf61d29fb 100644 --- a/src/core/locale-setup.c +++ b/src/core/locale-setup.c @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** This file is part of systemd. @@ -19,23 +17,24 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <stdlib.h> #include <errno.h> +#include <stdlib.h> +#include "env-util.h" +#include "fileio.h" #include "locale-setup.h" +#include "locale-util.h" +#include "string-util.h" +#include "strv.h" #include "util.h" #include "virt.h" -#include "fileio.h" -#include "strv.h" -#include "env-util.h" -#include "locale-util.h" int locale_setup(char ***environment) { char **add; char *variables[_VARIABLE_LC_MAX] = {}; int r = 0, i; - if (detect_container(NULL) <= 0) { + if (detect_container() <= 0) { r = parse_env_file("/proc/cmdline", WHITESPACE, "locale.LANG", &variables[VARIABLE_LANG], "locale.LANGUAGE", &variables[VARIABLE_LANGUAGE], |