From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/12683 Path: news.gmane.org!.POSTED!not-for-mail From: Samuel Holland Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH] Fix usage of __strftime_fmt_1 in wcsftime Date: Sat, 7 Apr 2018 09:46:03 -0500 Message-ID: References: <20180407142632.17260-1-samuel@sholland.org> <20180407142945.GC3094@brightrain.aerifal.cx> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1523112263 6277 195.159.176.226 (7 Apr 2018 14:44:23 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 7 Apr 2018 14:44:23 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 To: musl@lists.openwall.com Original-X-From: musl-return-12697-gllmg-musl=m.gmane.org@lists.openwall.com Sat Apr 07 16:44:19 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 1f4p4j-0001R5-NC for gllmg-musl@m.gmane.org; Sat, 07 Apr 2018 16:44:17 +0200 Original-Received: (qmail 20351 invoked by uid 550); 7 Apr 2018 14:46:17 -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 20328 invoked from network); 7 Apr 2018 14:46:16 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=BeDOLvBL59oUJUQL7WgyxBeyFMm6B qru/AD0eT1iCL0=; b=dt15JIJzwvZbbhd3ByRuaI9NUWzgxZ0oUl3mXikPsq98D yUjcd8ibQmRuCpraf6//kXZi8lsSNUDln+iNuMcIwofcBNOA4uH6X/J9ezrxV8qr waVOQaXkhXLqXoCbcBYSIXWXz4pxjYY6eVCj+xGL6GfQ56fGdNrSQ0z4qMVAAOYE qAGTlO50eS0LYVYgi+xhe3IsSDT+8NJWg18NcHmlBSg09sU85VdodPA/upvF+8JV pvPLkyZb10xU444k5re2qbZHGFBKIB+AtIBRxnQQaOR6vpjtI/Q4sdbBPJFPafm8 TUWYIIzuFmHBK54sTB7byYQR+4UjI1C3QNQayUdew== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=BeDOLv BL59oUJUQL7WgyxBeyFMm6Bqru/AD0eT1iCL0=; b=AmMYKBcOwOIRzVUwqBbeg4 GyvJ8WsgyNRIBYmZ8ggrITwE4w17VQofGouhHfBBNrn/LbQws1KhGtrASMpISN4/ Aqjd1R0j6FXiLFbX+mqH84emZI4fqnoM5bdQVohrYni5BNkh8nUMg6LPQvQHf25m p9p+81G8vVXvH1GyQrSSw3uOVODnzUElbkMdBOvs8KGz4VG5C6ARPFEj9BrtAl+E 0kGBZDZvwqbieTE9GYAxyYEaRjIKaiez9QtNrcvEkYQMIK+yycgFbHEuYJMpAK1L yDXGLDlGTeNFZxKsKmSocHaWyi1trHBX2Xjszrbr0py6mR51ojYP/7fVDmC+ZOSw == X-ME-Sender: In-Reply-To: <20180407142945.GC3094@brightrain.aerifal.cx> Content-Language: en-US Xref: news.gmane.org gmane.linux.lib.musl.general:12683 Archived-At: On 04/07/18 09:29, Rich Felker wrote: > On Sat, Apr 07, 2018 at 09:26:32AM -0500, Samuel Holland wrote: >> Commit 8a6bd7307da3fc4d08dd6a9277b611ccb4971354 modified the signature >> of __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] >> --- >> src/time/wcsftime.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/src/time/wcsftime.c b/src/time/wcsftime.c >> index 638e64f6..6584c45c 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) >> { >> @@ -35,7 +35,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, 0); >> if (!t_mb) break; >> k = mbstowcs(wbuf, t_mb, sizeof wbuf / sizeof *wbuf); >> if (k == (size_t)-1) return 0; >> -- >> 2.16.1 > > I think this is necessary but incomplete. It's likely the affected > functionality is not working in wcsftime... :( You're right, I'll send a complete patch for the functionality. > Rich Samuel