strftime: Consequently use the "L_" macro with character literals

ChangeLog:

	* time/strftime_l.c (__strftime_internal): Use "L_" macros, also add a
	missing space after the cast of "_NL_CURRENT".

diff --git a/ChangeLog b/ChangeLog
index 61703793258bfb26b754d7cd4d8627cf19a72e77..762762db5a0ded14beafe968d499fad51fefef01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-11  TAMUKI Shoichi  <tamuki@linet.gr.jp>
+
+       * time/strftime_l.c (__strftime_internal): Use "L_" macros, also add a
+       missing space after the cast of "_NL_CURRENT".
+
 2019-01-11  Rogerio A. Cardoso  <rcardoso@linux.ibm.com>
 
        * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h (vscr_t): Added

diff --git a/time/strftime_l.c b/time/strftime_l.c
index 6919749c63031ba02b41bb340ba04949b7d9b96b..7ba4179de3e89078151e537b8c4107a41f5166da 100644 (file)
--- a/time/strftime_l.c
+++ b/time/strftime_l.c
@@ -820,7 +820,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
          if (modifier == L_('O'))
            goto bad_format;
 #ifdef _NL_CURRENT
-         if (! (modifier == 'E'
+         if (! (modifier == L_('E')
                 && (*(subfmt =
                       (const CHAR_T *) _NL_CURRENT (LC_TIME,
                                                     NLW(ERA_D_T_FMT)))
@@ -917,7 +917,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
 #ifdef _NL_CURRENT
          if (! (modifier == L_('E')
                 && (*(subfmt =
-                      (const CHAR_T *)_NL_CURRENT (LC_TIME, NLW(ERA_D_FMT)))
+                      (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ERA_D_FMT)))
                     != L_('\0'))))
            subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT));
          goto subformat;
@@ -1262,7 +1262,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
          DO_NUMBER (1, tp->tm_wday);
 
        case L_('Y'):
-         if (modifier == 'E')
+         if (modifier == L_('E'))
            {
 #if HAVE_STRUCT_ERA_ENTRY
              struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG);