Mercurial > gnulib
changeset 40194:33c4cac699fe
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
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sat, 23 Feb 2019 15:07:47 -0800 |
| parents | 5fd32d128129 |
| children | 9734faea5d7b |
| files | ChangeLog lib/nstrftime.c |
| diffstat | 2 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Feb 23 22:42:54 2019 +0100 +++ b/ChangeLog Sat Feb 23 15:07:47 2019 -0800 @@ -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.
--- a/lib/nstrftime.c Sat Feb 23 22:42:54 2019 +0100 +++ b/lib/nstrftime.c Sat Feb 23 15:07:47 2019 -0800 @@ -418,7 +418,7 @@ 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 @@ 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 @@ 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 @@ 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;