From: TAMUKI Shoichi <tamuki@linet.gr.jp>
To: libc-alpha@sourceware.org
Subject: [PATCH v5 1/5] strftime: Add missing uses of L_ macro, etc. [BZ #23758]
Date: Sun, 06 Jan 2019 06:36:00 -0000 [thread overview]
Message-ID: <201901060633.AA04157@tamuki.linet.gr.jp> (raw)
In-Reply-To: <201901060628.AA04156@tamuki.linet.gr.jp>
At first, make an unrelated changes for the consistency.
ChangeLog:
[BZ #23758]
* time/strftime_l.c (__strftime_internal): Add missing uses of L_
macro, 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
next prev parent reply other threads:[~2019-01-06 6:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-06 6:30 [PATCH v5 0/5] strftime: Improve the width of alternate representation for year " TAMUKI Shoichi
2019-01-06 6:36 ` [PATCH v5 2/5] strftime: Set the default width of "%Ey" to 2 " TAMUKI Shoichi
2019-01-09 10:13 ` Rafal Luzynski
2019-01-09 10:25 ` Siddhesh Poyarekar
2019-01-09 23:02 ` Rafal Luzynski
2019-01-10 0:46 ` TAMUKI Shoichi
2019-01-06 6:36 ` [PATCH v5 3/5] strftime: Pass the additional flags from "%EY" to "%Ey" " TAMUKI Shoichi
2019-01-06 6:36 ` [PATCH v5 4/5] strftime: Add tst-strfitme2 " TAMUKI Shoichi
2019-01-06 6:36 ` TAMUKI Shoichi [this message]
2019-01-09 10:08 ` [PATCH v5 1/5] strftime: Add missing uses of L_ macro, etc. " Rafal Luzynski
2019-01-09 10:21 ` Siddhesh Poyarekar
2019-01-09 22:58 ` Rafal Luzynski
2019-01-11 4:54 ` TAMUKI Shoichi
2019-01-11 12:07 ` Rafal Luzynski
2019-01-11 14:21 ` Siddhesh Poyarekar
2019-01-10 0:46 ` TAMUKI Shoichi
2019-01-06 6:54 ` [PATCH v5 5/5] strftime: Document the description for "%EC", "%Ey", and "%EY" " TAMUKI Shoichi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201901060633.AA04157@tamuki.linet.gr.jp \
--to=tamuki@linet.gr.jp \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).