From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/12684 Path: news.gmane.org!.POSTED!not-for-mail From: Samuel Holland Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] implement wcsftime padding specifier extensions Date: Sat, 7 Apr 2018 09:47:16 -0500 Message-ID: <20180407144716.17741-1-samuel@sholland.org> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1523112328 10948 195.159.176.226 (7 Apr 2018 14:45:28 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 7 Apr 2018 14:45:28 +0000 (UTC) Cc: Samuel Holland To: musl@lists.openwall.com Original-X-From: musl-return-12698-gllmg-musl=m.gmane.org@lists.openwall.com Sat Apr 07 16:45:24 2018 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1f4p5m-0002kC-Cq for gllmg-musl@m.gmane.org; Sat, 07 Apr 2018 16:45:24 +0200 Original-Received: (qmail 23813 invoked by uid 550); 7 Apr 2018 14:47:29 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 23777 invoked from network); 7 Apr 2018 14:47:29 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=H5b2UWaSXOy1f4ZQb/kUtIeSMhZNiVkcq2eZT3r+i FE=; b=tLlzYnQjiZyuIfHcC6faX7I05rD4EWcF+fY7vEmb6WaO/bP4Z7YdbEEia XFSkzsrMDkBk+z432NxAHJ8WhkAuPDwRSOo32w/RDTRvh+VaOShGywoQsayavI6w 9wzW7s5M71piiWeCQ7rsGuzRm5l3K77yZkBIkjPrT/AJwF+Mx5FTAFx6isMfqBuz wDjCwst+bAzP1r7alE4RM9F8leUt+rg73NnqeHX/iBuW9OV5EdBJZ8b8wGtIbevk 1LnIGPliT6iCWYMS3ypU2+/s0BS5GpLE5FzSO3h9h3y76tCyzkF6nDgt45K4n1pB +1utXBgee4IRr/SJKsMBFRz/MUxVw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=H5b2UWaSXOy1f4ZQb /kUtIeSMhZNiVkcq2eZT3r+iFE=; b=H74gUJkhplvsJe8K9f8vlomrcwOrBf5YP 6dsnkhRWJjKVN8W5zMGqWERLDkCGKHU1QsUAONpkFmgI3/SPoAuG5IE7hoKNTa+J YilmelBqxwD6hs4cDIUEL5zmAk+KVfRyNZ/Pc+RkGnrVMlDQAlorxtXoMCrrywwl Tj9gyPFNc1JBBVUbmjt+hoAHn71cQjnVWt2d8Bdtxo7oeqdXTVOugWz/ED/3U+FW 0T8RyMYHAcXJeSgukp7d3cEq5/hQFrLAcUFhCrjopv1Gg7EppxwngioW07GeSRbM Lh/ohW6dbRH9IEjQo8U8zrMmI6mATOIKu0bbYoNruej+tbyreateQ== X-ME-Sender: X-Mailer: git-send-email 2.16.1 Xref: news.gmane.org gmane.linux.lib.musl.general:12684 Archived-At: 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. --- src/time/wcsftime.c | 8 +++++--- 1 file 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