From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id B3CA0383E81B for ; Mon, 23 May 2022 06:55:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B3CA0383E81B Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-336-y529F3ykMz6GiK0l0_q76g-1; Mon, 23 May 2022 02:55:21 -0400 X-MC-Unique: y529F3ykMz6GiK0l0_q76g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9DCE13801EC1; Mon, 23 May 2022 06:55:20 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C592DC27E8A; Mon, 23 May 2022 06:55:19 +0000 (UTC) From: Florian Weimer To: Adhemerval Zanella Cc: libc-alpha@sourceware.org Subject: Re: [PATCH 07/26] __printf_fphex always uses LC_NUMERIC References: <5adef6c1-60bd-efab-b947-1d26eceaa963@linaro.org> Date: Mon, 23 May 2022 08:55:17 +0200 In-Reply-To: <5adef6c1-60bd-efab-b947-1d26eceaa963@linaro.org> (Adhemerval Zanella's message of "Fri, 20 May 2022 11:21:35 -0300") Message-ID: <87fsl0zqju.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 May 2022 06:55:25 -0000 * Adhemerval Zanella: > On 17/03/2022 16:29, Florian Weimer via Libc-alpha wrote: >> There is no hexadecimal currency printing. strfmon uses >> __printf_fp_l exclusively. > > LGTM, some comments below. > > Reviewed-by: Adhemerval Zanella > >> --- >> stdio-common/printf_fphex.c | 26 +++++++------------------- >> 1 file changed, 7 insertions(+), 19 deletions(-) >> >> diff --git a/stdio-common/printf_fphex.c b/stdio-common/printf_fphex.c >> index 3dbbefd972..df11b4a166 100644 >> --- a/stdio-common/printf_fphex.c >> +++ b/stdio-common/printf_fphex.c >> @@ -103,9 +103,13 @@ __printf_fphex (FILE *fp, >> } >> fpnum; >> >> - /* Locale-dependent representation of decimal point. */ >> - const char *decimal; >> - wchar_t decimalwc; >> + /* Locale-dependent representation of decimal point. Hexadecimal >> + formatting always using LC_NUMERIC (disregarding info->extra). */ >> + const char *decimal = _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT); >> + wchar_t decimalwc = _NL_CURRENT_WORD (LC_NUMERIC, _NL_NUMERIC_DECIMAL_POINT_WC); > > Line too long. Fixed. >> + /* The decimal point character must never be zero. */ >> + assert (*decimal != '\0' && decimalwc != L'\0'); >> > > Should we assert for info->extra == 0 ? I added: /* This function always uses LC_NUMERIC. */ assert (info->extra == 0); Thanks, Florian