X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flocale%2Flocalectl.c;h=3690f9fc892c5037a15a42a09eb3e2f537291e3e;hp=5917364d7c308b666337095c271f6423aaead560;hb=9f03ee51a2207954ef18be79ca3e11cd14ca56fd;hpb=a34286684ebb78dd3db0d7f34feb2c121c9d00cc diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 5917364d7..3690f9fc8 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -114,19 +114,18 @@ static void print_overriden_variables(void) { 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\n", 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\n", 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]); }