From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id B08D2383A311; Mon, 23 May 2022 09:08:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B08D2383A311 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] __printf_fphex always uses LC_NUMERIC X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: 859e7a00af63ca0c28092c57316e9b832ceafb5e X-Git-Newrev: b094c52b1b65693368d0d70c505e0d0b4edad1c2 Message-Id: <20220523090830.B08D2383A311@sourceware.org> Date: Mon, 23 May 2022 09:08:30 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 May 2022 09:08:30 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b094c52b1b65693368d0d70c505e0d0b4edad1c2 commit b094c52b1b65693368d0d70c505e0d0b4edad1c2 Author: Florian Weimer Date: Mon May 23 10:08:18 2022 +0200 __printf_fphex always uses LC_NUMERIC There is no hexadecimal currency printing. strfmon uses __printf_fp_l exclusively. Reviewed-by: Adhemerval Zanella Diff: --- stdio-common/printf_fphex.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/stdio-common/printf_fphex.c b/stdio-common/printf_fphex.c index 3dbbefd972..5af380da62 100644 --- a/stdio-common/printf_fphex.c +++ b/stdio-common/printf_fphex.c @@ -103,9 +103,17 @@ __printf_fphex (FILE *fp, } fpnum; - /* Locale-dependent representation of decimal point. */ - const char *decimal; - wchar_t decimalwc; + /* This function always uses LC_NUMERIC. */ + assert (info->extra == 0); + + /* 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); + + /* The decimal point character must never be zero. */ + assert (*decimal != '\0' && decimalwc != L'\0'); /* "NaN" or "Inf" for the special cases. */ const char *special = NULL; @@ -147,22 +155,6 @@ __printf_fphex (FILE *fp, /* Nonzero if this is output on a wide character stream. */ int wide = info->wide; - - /* Figure out the decimal point character. */ - if (info->extra == 0) - { - decimal = _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT); - decimalwc = _NL_CURRENT_WORD (LC_NUMERIC, _NL_NUMERIC_DECIMAL_POINT_WC); - } - else - { - decimal = _NL_CURRENT (LC_MONETARY, MON_DECIMAL_POINT); - decimalwc = _NL_CURRENT_WORD (LC_MONETARY, - _NL_MONETARY_DECIMAL_POINT_WC); - } - /* The decimal point character must never be zero. */ - assert (*decimal != '\0' && decimalwc != L'\0'); - #define PRINTF_FPHEX_FETCH(FLOAT, VAR) \ { \ (VAR) = *(const FLOAT *) args[0]; \