Re: [PATCH] nstrftime: merge glibc strftime changes

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 52 bytes --]

Sure, that's easy enough. I installed the attached.

[-- Attachment #2: 0001-nstrftime-tweak-arg-order.patch --]
[-- Type: text/x-patch, Size: 3677 bytes --]

From 240c92d99b26c67ce3a5799f3e83258501595dc3 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 23 Feb 2019 15:07:47 -0800
Subject: [PATCH] nstrftime: tweak arg order

* lib/nstrftime.c (__strftime_internal): Interchange arg order.
All callers changed.  Suggested by TAMUKI Shoichi in:
https://lists.gnu.org/r/bug-gnulib/2019-02/msg00052.html
---
 ChangeLog       |  7 +++++++
 lib/nstrftime.c | 18 +++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 17f41bfd1..5a85496ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-02-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	nstrftime: tweak arg order
+	* lib/nstrftime.c (__strftime_internal): Interchange arg order.
+	All callers changed.  Suggested by TAMUKI Shoichi in:
+	https://lists.gnu.org/r/bug-gnulib/2019-02/msg00052.html
+
 2019-02-23  Bruno Haible  <bruno@clisp.org>
 
 	relocatable-prog: Use wrapper-free installation also on Mac OS X.
diff --git a/lib/nstrftime.c b/lib/nstrftime.c
index a45d809b2..424fb6069 100644
--- a/lib/nstrftime.c
+++ b/lib/nstrftime.c
@@ -418,7 +418,7 @@ iso_week_days (int yday, int wday)
 
 static size_t __strftime_internal (STREAM_OR_CHAR_T *, STRFTIME_ARG (size_t)
                                    const CHAR_T *, const struct tm *,
-                                   int, bool, bool *
+                                   bool, int, bool *
                                    extra_args_spec LOCALE_PARAM);
 
 /* Write information from TP into S according to the format
@@ -433,8 +433,8 @@ my_strftime (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
              const struct tm *tp extra_args_spec LOCALE_PARAM)
 {
   bool tzset_called = false;
-  return __strftime_internal (s, STRFTIME_ARG (maxsize) format, tp, 0,
-                              false, &tzset_called extra_args LOCALE_ARG);
+  return __strftime_internal (s, STRFTIME_ARG (maxsize) format, tp, false,
+                              0, &tzset_called extra_args LOCALE_ARG);
 }
 #if defined _LIBC && ! FPRINTFTIME
 libc_hidden_def (my_strftime)
@@ -446,8 +446,8 @@ libc_hidden_def (my_strftime)
 static size_t
 __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
                      const CHAR_T *format,
-                     const struct tm *tp, int yr_spec,
-                     bool upcase, bool *tzset_called
+                     const struct tm *tp, bool upcase,
+                     int yr_spec, bool *tzset_called
                      extra_args_spec LOCALE_PARAM)
 {
 #if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL
@@ -864,13 +864,13 @@ __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
         subformat:
           {
             size_t len = __strftime_internal (NULL, STRFTIME_ARG ((size_t) -1)
-                                              subfmt, tp, yr_spec,
-                                              to_uppcase, tzset_called
+                                              subfmt, tp, to_uppcase,
+                                              yr_spec, tzset_called
                                               extra_args LOCALE_ARG);
             add (len, __strftime_internal (p,
                                            STRFTIME_ARG (maxsize - i)
-                                           subfmt, tp, yr_spec,
-                                           to_uppcase, tzset_called
+                                           subfmt, tp, to_uppcase,
+                                           yr_spec, tzset_called
                                            extra_args LOCALE_ARG));
           }
           break;
-- 
2.17.1