lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

* stdio-common/_itoa.h: Define _itoa and _fitoa for 64-bit platforms.

Browse Source 
* malloc/mtrace.c: Revert last change.
	* posix/wordexp.c: Likewise.
This commit is contained in:
Ulrich Drepper
2007-01-25 00:45:00 +00:00
parent 9d6cde3dd5
commit 7fbc8784bd
4 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-01-24 Ulrich Drepper <drepper@redhat.com>
* stdio-common/_itoa.h: Define _itoa and _fitoa for 64-bit platforms.
* malloc/mtrace.c: Revert last change.
* posix/wordexp.c: Likewise.
2007-01-24 Jakub Jelinek <jakub@redhat.com> 2007-01-24 Jakub Jelinek <jakub@redhat.com>
* sysdeps/i386/bits/byteswap.h (__bswap_32): Add __nocona__, __core2__ * sysdeps/i386/bits/byteswap.h (__bswap_32): Add __nocona__, __core2__

26
malloc/mtrace.c
View File

@ -1,5 +1,5 @@
/* More debugging hooks for `malloc'. /* More debugging hooks for `malloc'.
Copyright (C) 1991-1994,1996-2004, 2007 Free Software Foundation, Inc. Copyright (C) 1991-1994,1996-2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Written April 2, 1991 by John Gilmore of Cygnus Support. Written April 2, 1991 by John Gilmore of Cygnus Support.
Based on mcheck.c by Mike Haertel. Based on mcheck.c by Mike Haertel.
@ -28,7 +28,6 @@
#include <dlfcn.h> #include <dlfcn.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -114,20 +113,15 @@ tr_where (caller)
buf = alloca (len + 6 + 2 * sizeof (void *)); buf = alloca (len + 6 + 2 * sizeof (void *));
buf[0] = '('; buf[0] = '(';
__stpcpy (_fitoa (caller >= (const __ptr_t) info.dli_saddr
char *cp = __stpcpy (__mempcpy (buf + 1, info.dli_sname, len), ? caller - (const __ptr_t) info.dli_saddr
caller >= (__ptr_t) info.dli_saddr : (const __ptr_t) info.dli_saddr - caller,
? "+0x" : "-0x"); __stpcpy (__mempcpy (buf + 1, info.dli_sname,
intptr_t offset = (caller >= (const __ptr_t) info.dli_saddr len),
? caller - (const __ptr_t) info.dli_saddr caller >= (__ptr_t) info.dli_saddr
: (const __ptr_t) info.dli_saddr - caller); ? "+0x" : "-0x"),
# if LLONG_MAX == LONG_MAX 16, 0),
cp = _fitoa_word (offset, cp, 16, 0); ")");
# else
cp = _fitoa (offset, cp, 16, 0);
# endif
__stpcpy (cp, ")");
} }
fprintf (mallstream, "@ %s%s%s[%p] ", fprintf (mallstream, "@ %s%s%s[%p] ",

12
posix/wordexp.c
View File

@ -1,5 +1,5 @@
/* POSIX.2 wordexp implementation. /* POSIX.2 wordexp implementation.
Copyright (C) 1997-2003, 2005, 2006, 2007 Free Software Foundation, Inc. Copyright (C) 1997-2002, 2003, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Tim Waugh <tim@cyberelk.demon.co.uk>. Contributed by Tim Waugh <tim@cyberelk.demon.co.uk>.
@ -25,7 +25,6 @@
#include <fnmatch.h> #include <fnmatch.h>
#include <glob.h> #include <glob.h>
#include <libintl.h> #include <libintl.h>
#include <limits.h>
#include <paths.h> #include <paths.h>
#include <pwd.h> #include <pwd.h>
#include <signal.h> #include <signal.h>
@ -758,13 +757,8 @@ parse_arith (char **word, size_t *word_length, size_t *max_length,
convertme = numresult; convertme = numresult;
result[20] = '\0'; result[20] = '\0';
char *numstr; *word = w_addstr (*word, word_length, max_length,
#if LLONG_MAX == LONG_MAX _itoa (convertme, &result[20], 10, 0));
numstr = _itoa_word (convertme, &result[20], 10, 0);
#else
numstr = _itoa (convertme, &result[20], 10, 0);
#endif
*word = w_addstr (*word, word_length, max_length, numstr);
free (expr); free (expr);
return *word ? 0 : WRDE_NOSPACE; return *word ? 0 : WRDE_NOSPACE;
} }

13
stdio-common/_itoa.h
View File

@ -1,5 +1,5 @@
/* Internal function for converting integers to ASCII. /* Internal function for converting integers to ASCII.
Copyright (C) 1994,95,96,97,98,99,2002,2003 Free Software Foundation, Inc. Copyright (C) 1994-1999,2002,2003,2007 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -19,7 +19,8 @@
#ifndef _ITOA_H #ifndef _ITOA_H
#define _ITOA_H #define _ITOA_H
#include <sys/cdefs.h>
#include <limits.h>
/* Convert VALUE into ASCII in base BASE (2..36). /* Convert VALUE into ASCII in base BASE (2..36).
Write backwards starting the character just before BUFLIM. Write backwards starting the character just before BUFLIM.
@ -81,4 +82,12 @@ extern char *_fitoa_word (unsigned long value, char *buf, unsigned int base,
extern char *_fitoa (unsigned long long value, char *buf, unsigned int base, extern char *_fitoa (unsigned long long value, char *buf, unsigned int base,
int upper_case) attribute_hidden; int upper_case) attribute_hidden;
#if LONG_MAX == LLONG_MAX
/* No need for special long long versions. */
# define _itoa(value, buf, base, upper_case) \
_itoa_word (value, buf, base, upper_case)
# define _fitoa(value, buf, base, upper_case) \
_fitoa_word (value, buf, base, upper_case)
#endif
#endif /* itoa.h */ #endif /* itoa.h */