From 20962acbea349b372311a727621c860006be3fab Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 22 Aug 2017 07:47:34 -0700 Subject: Hide internal printf functions [BZ #18822/21986] Hide internal printf functions to allow direct access within libc.so and libc.a without using GOT nor PLT. Since __guess_grouping has been changed to take 2 arguments by commit a1d84548c8aa7023cd039c85f81b831eef6d4a4c Author: Ulrich Drepper Date: Fri Feb 11 18:50:36 2000 +0000 the third argument passed to __guess_grouping is removed. [BZ #18822] [BZ #21986] * include/printf.h (__printf_fphex): Add attribute_hidden. (__guess_grouping): New prototype. * stdio-common/printf_fp.c (__guess_grouping): Removed. * stdio-common/reg-printf.c (__register_printf_specifier): Add libc_hidden_proto and libc_hidden_def. * stdlib/strfmon_l.c (__guess_grouping): Removed. (__vstrfmon_l): Remove the third argument passed to __guess_grouping. --- stdlib/strfmon_l.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'stdlib') diff --git a/stdlib/strfmon_l.c b/stdlib/strfmon_l.c index 98554dfe80..1df184e8b2 100644 --- a/stdlib/strfmon_l.c +++ b/stdlib/strfmon_l.c @@ -68,11 +68,6 @@ #define _NL_CURRENT(category, item) \ (current->values[_NL_ITEM_INDEX (item)].string) -/* This function determines the number of digit groups in the output. - The definition is in printf_fp.c. */ -extern unsigned int __guess_grouping (unsigned int intdig_max, - const char *grouping, wchar_t sepchar); - /* We have to overcome some problems with this implementation. On the one hand the strfmon() function is specified in XPG4 and of course @@ -324,9 +319,7 @@ __vstrfmon_l (char *s, size_t maxsize, locale_t loc, const char *format, extra characters this means. */ if (group && left_prec != -1) left_prec += __guess_grouping (left_prec, - _NL_CURRENT (LC_MONETARY, MON_GROUPING), - *_NL_CURRENT (LC_MONETARY, - MON_THOUSANDS_SEP)); + _NL_CURRENT (LC_MONETARY, MON_GROUPING)); /* Now it's time to get the value. */ if (is_long_double == 1) -- cgit 1.4.1