diff options
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/_itoa.c | 23 | ||||
| -rw-r--r-- | stdio-common/itoa-digits.c | 6 | ||||
| -rw-r--r-- | stdio-common/itoa-udigits.c | 6 | ||||
| -rw-r--r-- | stdio-common/psiginfo.c | 9 | ||||
| -rw-r--r-- | stdio-common/psignal.c | 11 |
5 files changed, 16 insertions, 39 deletions
diff --git a/stdio-common/_itoa.c b/stdio-common/_itoa.c index 12d69541b9..ebb3e857c6 100644 --- a/stdio-common/_itoa.c +++ b/stdio-common/_itoa.c @@ -1,6 +1,5 @@ /* Internal function for converting integers to ASCII. - Copyright (C) 1994, 1995, 1996, 1999, 2000, 2002, 2003, 2004, 2007 - Free Software Foundation, Inc. + Copyright (C) 1994-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Torbjorn Granlund <tege@matematik.su.se> and Ulrich Drepper <drepper@gnu.org>. @@ -160,27 +159,13 @@ const struct base_table_t _itoa_base_table[] attribute_hidden = }; #endif -/* Lower-case digits. */ -extern const char _itoa_lower_digits[]; -extern const char _itoa_lower_digits_internal[] attribute_hidden; -/* Upper-case digits. */ -extern const char _itoa_upper_digits[]; -extern const char _itoa_upper_digits_internal[] attribute_hidden; - - char * _itoa_word (_ITOA_WORD_TYPE value, char *buflim, unsigned int base, int upper_case) { const char *digits = (upper_case -#if !defined NOT_IN_libc || defined IS_IN_rtld - ? INTUSE(_itoa_upper_digits) - : INTUSE(_itoa_lower_digits) -#else ? _itoa_upper_digits - : _itoa_lower_digits -#endif - ); + : _itoa_lower_digits); switch (base) { @@ -213,8 +198,8 @@ _itoa (value, buflim, base, upper_case) int upper_case; { const char *digits = (upper_case - ? INTUSE(_itoa_upper_digits) - : INTUSE(_itoa_lower_digits)); + ? _itoa_upper_digits + : _itoa_lower_digits); const struct base_table_t *brec = &_itoa_base_table[base - 2]; switch (base) diff --git a/stdio-common/itoa-digits.c b/stdio-common/itoa-digits.c index b0a652d6cf..e38f48405e 100644 --- a/stdio-common/itoa-digits.c +++ b/stdio-common/itoa-digits.c @@ -1,5 +1,5 @@ /* Digits. - Copyright (C) 1994,1995,1996,1999,2000,2002 Free Software Foundation, Inc. + Copyright (C) 1994-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,7 +16,9 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#include <_itoa.h> + /* Lower-case digits. */ const char _itoa_lower_digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; -INTVARDEF(_itoa_lower_digits) +libc_hidden_data_def (_itoa_lower_digits) diff --git a/stdio-common/itoa-udigits.c b/stdio-common/itoa-udigits.c index 39f9549c9c..215af7126e 100644 --- a/stdio-common/itoa-udigits.c +++ b/stdio-common/itoa-udigits.c @@ -1,5 +1,5 @@ /* Digits. - Copyright (C) 1994,1995,1996,1999,2000,2002 Free Software Foundation, Inc. + Copyright (C) 1994-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,7 +16,9 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#include <_itoa.h> + /* Upper-case digits. */ const char _itoa_upper_digits[36] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; -INTVARDEF(_itoa_upper_digits) +libc_hidden_data_def (_itoa_upper_digits) diff --git a/stdio-common/psiginfo.c b/stdio-common/psiginfo.c index eb758c481a..9701fcd8a7 100644 --- a/stdio-common/psiginfo.c +++ b/stdio-common/psiginfo.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -26,11 +26,6 @@ #include <not-cancel.h> -/* Defined in sys_siglist.c. */ -extern const char *const _sys_siglist[]; -extern const char *const _sys_siglist_internal[] attribute_hidden; - - #define MF(l) MF1 (l) #define MF1(l) str_##l #define C(s1, s2) C1 (s1, s2) @@ -84,7 +79,7 @@ psiginfo (const siginfo_t *pinfo, const char *s) const char *desc; if (pinfo->si_signo >= 0 && pinfo->si_signo < NSIG - && ((desc = INTUSE(_sys_siglist)[pinfo->si_signo]) != NULL + && ((desc = _sys_siglist[pinfo->si_signo]) != NULL #ifdef SIGRTMIN || (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX) #endif diff --git a/stdio-common/psignal.c b/stdio-common/psignal.c index 23026f9b18..309803a978 100644 --- a/stdio-common/psignal.c +++ b/stdio-common/psignal.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1991, 1992, 1995, 1996, 1997, 2001, 2002, 2004, 2005, 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1991-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,12 +21,6 @@ #include <libintl.h> #include <wchar.h> - -/* Defined in sys_siglist.c. */ -extern const char *const _sys_siglist[]; -extern const char *const _sys_siglist_internal[] attribute_hidden; - - /* Print out on stderr a line consisting of the test in S, a colon, a space, a message describing the meaning of the signal number SIG and a newline. If S is NULL or "", the colon and space are omitted. */ @@ -41,7 +34,7 @@ psignal (int sig, const char *s) else colon = ": "; - if (sig >= 0 && sig < NSIG && (desc = INTUSE(_sys_siglist)[sig]) != NULL) + if (sig >= 0 && sig < NSIG && (desc = _sys_siglist[sig]) != NULL) (void) __fxprintf (NULL, "%s%s%s\n", s, colon, _(desc)); else { |