Move stdio-common/_itoa.h to sysdeps/generic

2024-12-22 02:40:08 +00:00 · 2012-03-20 16:00:23 -07:00 · 2012-03-20 16:00:23 -07:00 · eb96ffb07d
commit eb96ffb07d
parent d1af992d0d
52 changed files with 116 additions and 52 deletions
--- a/64
+++ b/64
@ -1,3 +1,67 @@
+2012-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* debug/backtracesymsfd.c: Include <_itoa.h> instead of
+	<stdio-common/_itoa.h>.
+	* debug/segfault.c: Likewise.
+	* elf/dl-cache.c: Likewise.
+	* elf/dl-minimal.c: Likewise.
+	* elf/dl-misc.c: Likewise.
+	* elf/dl-sysdep.c: Likewise.
+	* elf/dl-version.c: Likewise.
+	* elf/rtld.c: Likewise.
+	* hurd/hurdsock.c: Likewise.
+	* hurd/lookup-retry.c: Likewise.
+	* malloc/malloc.c: Likewise.
+	* malloc/mtrace.c: Likewise.
+	* nscd/nscd_getgr_r.c: Likewise.
+	* nscd/nscd_getpw_r.c: Likewise.
+	* nscd/nscd_getserv_r.c: Likewise.
+	* posix/getopt_init.c: Likewise.
+	* posix/wordexp.c: Likewise.
+	* stdio-common/_itoa.c: Likewise.
+	* stdio-common/printf_fphex.c: Likewise.
+	* stdio-common/vfprintf.c: Likewise.
+	* string/_strerror.c: Likewise.
+	* sysdeps/generic/elf/backtracesymsfd.c: Likewise.
+	* sysdeps/i386/i686/hp-timing.h: Likewise.
+	* sysdeps/mach/_strerror.c: Likewise.
+	* sysdeps/mach/hurd/powerpc/register-dump.h: Likewise.
+	* sysdeps/mach/hurd/sethostid.c: Likewise.
+	* sysdeps/mach/hurd/xmknodat.c: Likewise.
+	* sysdeps/mach/xpg-strerror.c: Likewise.
+	* sysdeps/powerpc/powerpc32/dl-machine.c: Likewise.
+	* sysdeps/powerpc/powerpc32/power4/hp-timing.h: Likewise.
+	* sysdeps/powerpc/powerpc32/register-dump.h: Likewise.
+	* sysdeps/powerpc/powerpc64/dl-machine.c: Likewise.
+	* sysdeps/powerpc/powerpc64/hp-timing.h: Likewise.
+	* sysdeps/powerpc/powerpc64/register-dump.h: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/hp-timing.h: Likewise.
+	* sysdeps/sparc/sparc64/hp-timing.h: Likewise.
+	* sysdeps/unix/sysv/linux/fd_to_filename.h: Likewise.
+	* sysdeps/unix/sysv/linux/futimes.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/register-dump.h: Likewise.
+	* sysdeps/unix/sysv/linux/ptsname.c: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-32/register-dump.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-64/register-dump.h: Likewise.
+	* sysdeps/unix/sysv/linux/sh/sh3/register-dump.h: Likewise.
+	* sysdeps/unix/sysv/linux/sh/sh4/register-dump.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h: Likewise.
+	* sysdeps/unix/sysv/linux/ttyname.c: Likewise.
+	* sysdeps/unix/sysv/linux/ttyname_r.c: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/register-dump.h: Likewise.
+
+	* stdio-common/_itoa.c: Include <_itoa.h> instead of "_itoa.h".
+
+	* stdio-common/_itoa.h: Moved to ...
+	* sysdeps/generic/_itoa.h: Here.
+
+	* stdio-common/_itowa.c: Include <_itowa.h> instead of "_itowa.h".
+
+	* stdio-common/printf_fphex.c: Include <_itoa.h> and <_itowa.h>
+	instead of "_itoa.h" and "_itowa.h".
+	* stdio-common/vfprintf.: Likewise.
+
 2012-03-20  H.J. Lu  <hongjiu.lu@intel.com>

 	* sysdeps/x86_64/fpu/bits/mathinline.h: Don't include
--- a/debug/backtracesymsfd.c
+++ b/debug/backtracesymsfd.c
@ -21,7 +21,7 @@
 #include <string.h>
 #include <sys/uio.h>

-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <not-cancel.h>

 #if __ELF_NATIVE_CLASS == 32
--- a/debug/segfault.c
+++ b/debug/segfault.c
@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <ldsodefs.h>

 #include <bp-checks.h>
--- a/elf/dl-cache.c
+++ b/elf/dl-cache.c
@ -24,7 +24,7 @@
 #include <dl-cache.h>
 #include <dl-procinfo.h>

-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 #ifndef _DL_PLATFORMS_COUNT
 # define _DL_PLATFORMS_COUNT 0
--- a/elf/dl-minimal.c
+++ b/elf/dl-minimal.c
@ -26,7 +26,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <ldsodefs.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 #include <assert.h>

--- a/elf/dl-misc.c
+++ b/elf/dl-misc.c
@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <sysdep.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <bits/libc-lock.h>

 /* Read the whole contents of FILE into new mmap'd space with given
--- a/elf/dl-sysdep.c
+++ b/elf/dl-sysdep.c
@ -29,7 +29,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <ldsodefs.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <fpu_control.h>

 #include <entry.h>
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ldsodefs.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 #include <assert.h>

--- a/elf/rtld.c
+++ b/elf/rtld.c
@ -27,7 +27,7 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <ldsodefs.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <entry.h>
 #include <fpu_control.h>
 #include <hp-timing.h>
--- a/hurd/hurdsock.c
+++ b/hurd/hurdsock.c
@ -22,7 +22,7 @@
 #include <string.h>
 #include <hurd/paths.h>
 #include <stdio.h>
-#include "stdio-common/_itoa.h"
+#include <_itoa.h>
 #include <cthreads.h>		/* For `struct mutex'.  */
 #include "hurdmalloc.h"		/* XXX */

--- a/hurd/lookup-retry.c
+++ b/hurd/lookup-retry.c
@ -24,7 +24,7 @@
 #include <limits.h>
 #include <fcntl.h>
 #include <string.h>
-#include "stdio-common/_itoa.h"
+#include <_itoa.h>

 /* Translate the error from dir_lookup into the error the user sees.  */
 static inline error_t
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@ -218,7 +218,7 @@
 #include <malloc-machine.h>

 #include <atomic.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <bits/wordsize.h>
 #include <sys/sysinfo.h>

--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdlib.h>

-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 #include <libc-internal.h>

--- a/nscd/nscd_getgr_r.c
+++ b/nscd/nscd_getgr_r.c
@ -31,7 +31,7 @@
 #include <sys/uio.h>
 #include <sys/un.h>
 #include <not-cancel.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 #include "nscd-client.h"
 #include "nscd_proto.h"
--- a/nscd/nscd_getpw_r.c
+++ b/nscd/nscd_getpw_r.c
@ -30,7 +30,7 @@
 #include <sys/uio.h>
 #include <sys/un.h>
 #include <not-cancel.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 #include "nscd-client.h"
 #include "nscd_proto.h"
--- a/nscd/nscd_getserv_r.c
+++ b/nscd/nscd_getserv_r.c
@ -20,7 +20,7 @@
 #include <errno.h>
 #include <string.h>
 #include <not-cancel.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 #include "nscd-client.h"
 #include "nscd_proto.h"
--- a/posix/getopt_init.c
+++ b/posix/getopt_init.c
@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <sys/types.h>

-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* Variable to synchronize work.  */
 char *__getopt_nonoption_flags;
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@ -42,7 +42,7 @@
 #include <kernel-features.h>

 #include <bits/libc-lock.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* Undefine the following line for the production version.  */
 /* #define NDEBUG 1 */
--- a/stdio-common/_itoa.c
+++ b/stdio-common/_itoa.c
@ -25,7 +25,7 @@
 #include <stdlib/gmp-impl.h>
 #include <stdlib/longlong.h>

-#include "_itoa.h"
+#include <_itoa.h>


 /* Canonize environment.  For some architectures not all values might
--- a/stdio-common/_itowa.c
+++ b/stdio-common/_itowa.c
@ -24,7 +24,7 @@
 #include <stdlib/gmp-impl.h>
 #include <stdlib/longlong.h>

-#include "_itowa.h"
+#include <_itowa.h>


 /* Canonize environment.  For some architectures not all values might
--- a/stdio-common/printf_fphex.c
+++ b/stdio-common/printf_fphex.c
@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
-#include "_itoa.h"
-#include "_itowa.h"
+#include <_itoa.h>
+#include <_itowa.h>
 #include <locale/localeinfo.h>

 /* #define NDEBUG 1*/		/* Undefine this for debugging assertions.  */
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@ -26,7 +26,7 @@
 #include <wchar.h>
 #include <bits/libc-lock.h>
 #include <sys/param.h>
-#include "_itoa.h"
+#include <_itoa.h>
 #include <locale/localeinfo.h>
 #include <stdio.h>

@ -102,7 +102,7 @@
 # define ISDIGIT(Ch)	((unsigned int) ((Ch) - L'0') < 10)
 # define STR_LEN(Str)	__wcslen (Str)

-# include "_itowa.h"
+# include <_itowa.h>

 # define PUT(F, S, N)	_IO_sputn ((F), (S), (N))
 # define PAD(Padchar) \
--- a/string/_strerror.c
+++ b/string/_strerror.c
@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* It is critical here that we always use the `dcgettext' function for
   the message translation.  Since <libintl.h> only defines the macro
--- a/sysdeps/generic/_itoa.h
+++ b/sysdeps/generic/_itoa.h
--- a/sysdeps/generic/elf/backtracesymsfd.c
+++ b/sysdeps/generic/elf/backtracesymsfd.c
@ -21,7 +21,7 @@
 #include <string.h>
 #include <sys/uio.h>

-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <ldsodefs.h>

 #if __ELF_NATIVE_CLASS == 32
--- a/sysdeps/i386/i686/hp-timing.h
+++ b/sysdeps/i386/i686/hp-timing.h
@ -22,7 +22,7 @@

 #include <string.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* The macros defined here use the timestamp counter in i586 and up versions
   of the x86 processors.  They provide a very accurate way to measure the
--- a/sysdeps/mach/_strerror.c
+++ b/sysdeps/mach/_strerror.c
@ -21,7 +21,7 @@
 #include <mach/error.h>
 #include <errorlib.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* It is critical here that we always use the `dcgettext' function for
   the message translation.  Since <libintl.h> only defines the macro
--- a/sysdeps/mach/hurd/powerpc/register-dump.h
+++ b/sysdeps/mach/hurd/powerpc/register-dump.h
@ -17,7 +17,7 @@
   <http://www.gnu.org/licenses/>.  */

 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* This prints out the information in the following form: */
 static const char dumpform[] = "\
--- a/sysdeps/mach/hurd/sethostid.c
+++ b/sysdeps/mach/hurd/sethostid.c
@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <hurd.h>
 #include "hurdhost.h"
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* Set the current machine's Internet number to ID.
   This call is restricted to the super-user.  */
--- a/sysdeps/mach/hurd/xmknodat.c
+++ b/sysdeps/mach/hurd/xmknodat.c
@ -23,7 +23,7 @@
 #include <hurd/fd.h>
 #include <hurd/paths.h>
 #include <fcntl.h>
-#include "stdio-common/_itoa.h"
+#include <_itoa.h>
 #include <string.h>
 #include <sys/types.h>

--- a/sysdeps/mach/xpg-strerror.c
+++ b/sysdeps/mach/xpg-strerror.c
@ -23,7 +23,7 @@
 #include <mach/error.h>
 #include <errorlib.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* It is critical here that we always use the `dcgettext' function for
   the message translation.  Since <libintl.h> only defines the macro
--- a/sysdeps/powerpc/powerpc32/dl-machine.c
+++ b/sysdeps/powerpc/powerpc32/dl-machine.c
@ -23,7 +23,7 @@
 #include <ldsodefs.h>
 #include <elf/dynamic-link.h>
 #include <dl-machine.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* The value __cache_line_size is defined in dl-sysdep.c and is initialised
   by _dl_sysdep_start via DL_PLATFORM_INIT.  */
--- a/sysdeps/powerpc/powerpc32/power4/hp-timing.h
+++ b/sysdeps/powerpc/powerpc32/power4/hp-timing.h
@ -22,7 +22,7 @@

 #include <string.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <atomic.h>

 /* The macros defined here use the powerpc 64-bit time base register.
--- a/sysdeps/powerpc/powerpc32/register-dump.h
+++ b/sysdeps/powerpc/powerpc32/register-dump.h
@ -17,7 +17,7 @@
   <http://www.gnu.org/licenses/>.  */

 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* This prints out the information in the following form: */
 static const char dumpform[] = "\
--- a/sysdeps/powerpc/powerpc64/dl-machine.c
+++ b/sysdeps/powerpc/powerpc64/dl-machine.c
@ -19,7 +19,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <dl-machine.h>

 void
--- a/sysdeps/powerpc/powerpc64/hp-timing.h
+++ b/sysdeps/powerpc/powerpc64/hp-timing.h
@ -22,7 +22,7 @@

 #include <string.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <atomic.h>

 /* The macros defined here use the powerpc 64-bit time base register.
--- a/sysdeps/powerpc/powerpc64/register-dump.h
+++ b/sysdeps/powerpc/powerpc64/register-dump.h
@ -17,7 +17,7 @@
   <http://www.gnu.org/licenses/>.  */

 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* This prints out the information in the following form: */
 static const char dumpform[] = "\
--- a/sysdeps/sparc/sparc32/sparcv9/hp-timing.h
+++ b/sysdeps/sparc/sparc32/sparcv9/hp-timing.h
@ -22,7 +22,7 @@

 #include <string.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 #define HP_TIMING_AVAIL		(1)
 #define HP_TIMING_INLINE	(1)
--- a/sysdeps/sparc/sparc64/hp-timing.h
+++ b/sysdeps/sparc/sparc64/hp-timing.h
@ -22,7 +22,7 @@

 #include <string.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 #define HP_TIMING_AVAIL		(1)
 #define HP_TIMING_INLINE	(1)
--- a/sysdeps/unix/sysv/linux/fd_to_filename.h
+++ b/sysdeps/unix/sysv/linux/fd_to_filename.h
@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 static inline const char *
 fd_to_filename (int fd)
--- a/sysdeps/unix/sysv/linux/futimes.c
+++ b/sysdeps/unix/sysv/linux/futimes.c
@ -22,7 +22,7 @@
 #include <time.h>
 #include <utime.h>
 #include <sys/time.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <fcntl.h>

 #include <kernel-features.h>
--- a/sysdeps/unix/sysv/linux/i386/register-dump.h
+++ b/sysdeps/unix/sysv/linux/i386/register-dump.h
@ -18,7 +18,7 @@
   <http://www.gnu.org/licenses/>.  */

 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* We will print the register dump in this format:

--- a/sysdeps/unix/sysv/linux/ptsname.c
+++ b/sysdeps/unix/sysv/linux/ptsname.c
@ -26,7 +26,7 @@
 #include <termios.h>
 #include <unistd.h>

-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* Check if DEV corresponds to a master pseudo terminal device.  */
 #define MASTER_P(Dev)                                                         \
--- a/sysdeps/unix/sysv/linux/s390/s390-32/register-dump.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/register-dump.h
@ -18,7 +18,7 @@
   <http://www.gnu.org/licenses/>.  */

 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* We will print the register dump in this format:

--- a/sysdeps/unix/sysv/linux/s390/s390-64/register-dump.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/register-dump.h
@ -18,7 +18,7 @@
   <http://www.gnu.org/licenses/>.  */

 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* We will print the register dump in this format:

--- a/sysdeps/unix/sysv/linux/sh/sh3/register-dump.h
+++ b/sysdeps/unix/sysv/linux/sh/sh3/register-dump.h
@ -17,7 +17,7 @@
   <http://www.gnu.org/licenses/>.  */

 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* We will print the register dump in this format:

--- a/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
+++ b/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
@ -17,7 +17,7 @@
   <http://www.gnu.org/licenses/>.  */

 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* We will print the register dump in this format:

--- a/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h
@ -18,7 +18,7 @@
   <http://www.gnu.org/licenses/>.  */

 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* We will print the register dump in this format:

--- a/sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h
@ -18,7 +18,7 @@
   <http://www.gnu.org/licenses/>.  */

 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* We will print the register dump in this format:

--- a/sysdeps/unix/sysv/linux/ttyname.c
+++ b/sysdeps/unix/sysv/linux/ttyname.c
@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdlib.h>

-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <kernel-features.h>

 #if 0
--- a/sysdeps/unix/sysv/linux/ttyname_r.c
+++ b/sysdeps/unix/sysv/linux/ttyname_r.c
@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdlib.h>

-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <kernel-features.h>

 static int getttyname_r (char *buf, size_t buflen,
--- a/sysdeps/unix/sysv/linux/x86_64/register-dump.h
+++ b/sysdeps/unix/sysv/linux/x86_64/register-dump.h
@ -17,7 +17,7 @@
   <http://www.gnu.org/licenses/>.  */

 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>

 /* We will print the register dump in this format: