diff options
| author | Samuel Holland <samuel@sholland.org> | 2018-04-07 09:47:16 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2018-04-07 19:03:15 -0400 |
| commit | ea81529fb92932a50f06bf7a19cae812ae6cdb59 (patch) | |
| tree | 825a33a65ae71f195e27dc773dbfd6c2d3742f47 | |
| parent | 119bc55ba66542a1c2fb7fc1c4e6c85f46b97c57 (diff) | |
| download | musl-ea81529fb92932a50f06bf7a19cae812ae6cdb59.tar.gz | |
implement wcsftime padding specifier extensions
Commit 8a6bd7307da3fc4d08dd6a9277b611ccb4971354 added support for
padding specifier extensions to strftime, but did not modify wcsftime.
In the process, it added a parameter to __strftime_fmt_1 in strftime.c,
but failed to update the prototype in wcsftime.c. This was found by
compiling musl with LTO:
src/time/wcsftime.c:7:13: warning: type of '__strftime_fmt_1' does \
not match original declaration [-Wlto-type-mismatch]
Fix the prototype of __strftime_fmt_1 in wcsftime.c, and generate the
'pad' argument the same way as it is done in strftime.
| -rw-r--r-- | src/time/wcsftime.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/time/wcsftime.c b/src/time/wcsftime.c index 638e64f6..23500cc8 100644 --- a/src/time/wcsftime.c +++ b/src/time/wcsftime.c @@ -4,7 +4,7 @@ #include "locale_impl.h" #include "libc.h" -const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc); +const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc, int pad); size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, const struct tm *restrict tm, locale_t loc) { @@ -14,7 +14,7 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co wchar_t *p; const char *t_mb; const wchar_t *t; - int plus; + int pad, plus; unsigned long width; for (l=0; l<n; f++) { if (!*f) { @@ -26,6 +26,8 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co continue; } f++; + pad = 0; + if (*f == '-' || *f == '_' || *f == '0') pad = *f++; if ((plus = (*f == '+'))) f++; width = wcstoul(f, &p, 10); if (*p == 'C' || *p == 'F' || *p == 'G' || *p == 'Y') { @@ -35,7 +37,7 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co } f = p; if (*f == 'E' || *f == 'O') f++; - t_mb = __strftime_fmt_1(&buf, &k, *f, tm, loc); + t_mb = __strftime_fmt_1(&buf, &k, *f, tm, loc, pad); if (!t_mb) break; k = mbstowcs(wbuf, t_mb, sizeof wbuf / sizeof *wbuf); if (k == (size_t)-1) return 0; |