From patchwork Mon Aug 21 22:04:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lu, Hongjiu" X-Patchwork-Id: 22295 Received: (qmail 12862 invoked by alias); 21 Aug 2017 22:04:27 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 12845 invoked by uid 89); 21 Aug 2017 22:04:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, NO_DNS_FOR_FROM, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: mga01.intel.com X-ExtLoop1: 1 Date: Mon, 21 Aug 2017 15:04:21 -0700 From: "H.J. Lu" To: GNU C Library Subject: [PATCH] Hide internal printf functions [BZ #18822/21986] Message-ID: <20170821220421.GA25502@gmail.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.3 (2017-05-23) 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. OK for master? H.J. --- [BZ #18822] [BZ #21986] * include/printf.h (__printf_fphex): Add attribute_hidden. (__guess_grouping): Likewise. * stdio-common/printf_fp.c (__guess_grouping): Moved to ... * stdio-common/printf.h (__guess_grouping): Here. New. * 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. --- include/printf.h | 4 +++- stdio-common/printf.h | 3 +++ stdio-common/printf_fp.c | 2 -- stdio-common/reg-printf.c | 2 ++ stdlib/strfmon_l.c | 9 +-------- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/printf.h b/include/printf.h index 7b4d209c47..43695a480d 100644 --- a/include/printf.h +++ b/include/printf.h @@ -8,7 +8,7 @@ /* Now define the internal interfaces. */ extern int __printf_fphex (FILE *, const struct printf_info *, - const void *const *); + const void *const *) attribute_hidden; extern int __printf_fp (FILE *, const struct printf_info *, const void *const *); libc_hidden_proto (__printf_fp) @@ -16,5 +16,7 @@ extern int __printf_fp_l (FILE *, locale_t, const struct printf_info *, const void *const *); libc_hidden_proto (__printf_fp_l) +extern __typeof (__guess_grouping) __guess_grouping attribute_hidden; + # endif /* !_ISOMAC */ #endif diff --git a/stdio-common/printf.h b/stdio-common/printf.h index 940256445e..155dfdc7d3 100644 --- a/stdio-common/printf.h +++ b/stdio-common/printf.h @@ -182,6 +182,9 @@ extern int printf_size_info (const struct printf_info *__restrict __info, size_t __n, int *__restrict __argtypes) __THROW; +extern unsigned int __guess_grouping (unsigned int intdig_max, + const char *grouping); + #ifdef __LDBL_COMPAT # include #endif diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c index 3ed4037ba5..2633a02cc5 100644 --- a/stdio-common/printf_fp.c +++ b/stdio-common/printf_fp.c @@ -139,8 +139,6 @@ extern mp_size_t __mpn_extract_double (mp_ptr res_ptr, mp_size_t size, extern mp_size_t __mpn_extract_long_double (mp_ptr res_ptr, mp_size_t size, int *expt, int *is_neg, long double value); -extern unsigned int __guess_grouping (unsigned int intdig_max, - const char *grouping); static wchar_t *group_number (wchar_t *buf, wchar_t *bufend, diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c index cbb9307795..fed5a16a7b 100644 --- a/stdio-common/reg-printf.c +++ b/stdio-common/reg-printf.c @@ -32,6 +32,7 @@ __libc_lock_define_initialized (static, lock) int __register_printf_specifier (int, printf_function, printf_arginfo_size_function); +libc_hidden_proto (__register_printf_specifier) int __register_printf_function (int, printf_function, printf_arginfo_function); @@ -72,6 +73,7 @@ __register_printf_specifier (int spec, printf_function converter, return result; } +libc_hidden_def (__register_printf_specifier) weak_alias (__register_printf_specifier, register_printf_specifier) 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)