This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v6] strftime: Consequently use the "L_" macro with character literals
- From: TAMUKI Shoichi <tamuki at linet dot gr dot jp>
- To: libc-alpha at sourceware dot org
- Date: Fri, 11 Jan 2019 13:46:40 +0900
- Subject: [PATCH v6] strftime: Consequently use the "L_" macro with character literals
Make unrelated changes for the consistency.
ChangeLog:
* time/strftime_l.c (__strftime_internal): Use "L_" macros, also add a
missing space after the cast of "_NL_CURRENT".
---
time/strftime_l.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/time/strftime_l.c b/time/strftime_l.c
index 6919749c630..7ba4179de3e 100644
--- 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);
--
2.12.2