This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.28.9000-557-g5cbbf01


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  5cbbf01ebe26b84c9c58d4b7f7d2c41038d7c68b (commit)
      from  0bc9bdf159f43c50ec31e9a1670e2e04b5d4060d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5cbbf01ebe26b84c9c58d4b7f7d2c41038d7c68b

commit 5cbbf01ebe26b84c9c58d4b7f7d2c41038d7c68b
Author: TAMUKI Shoichi <tamuki@linet.gr.jp>
Date:   Fri Jan 11 13:46:40 2019 +0900

    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 6170379..762762d 100644
--- 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 6919749..7ba4179 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);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    5 +++++
 time/strftime_l.c |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]