about summary refs log tree commit diff
path: root/posix/wordexp.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-01-25 00:45:00 +0000
committerUlrich Drepper <drepper@redhat.com>2007-01-25 00:45:00 +0000
commit7fbc8784bdd8fa234e8c1fd10bb71e057d54072e (patch)
treec56c6ee0b5629d11c3454844bd1b8735e684e71b /posix/wordexp.c
parent9d6cde3dd555b7501037332842879001cf66091b (diff)
downloadglibc-7fbc8784bdd8fa234e8c1fd10bb71e057d54072e.tar.gz
glibc-7fbc8784bdd8fa234e8c1fd10bb71e057d54072e.tar.xz
glibc-7fbc8784bdd8fa234e8c1fd10bb71e057d54072e.zip
* stdio-common/_itoa.h: Define _itoa and _fitoa for 64-bit platforms.
	* malloc/mtrace.c: Revert last change.
	* posix/wordexp.c: Likewise.
Diffstat (limited to 'posix/wordexp.c')
-rw-r--r--posix/wordexp.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/posix/wordexp.c b/posix/wordexp.c
index 40d1b6a7db..765d14d81f 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -1,5 +1,5 @@
 /* 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.
    Contributed by Tim Waugh <tim@cyberelk.demon.co.uk>.
 
@@ -25,7 +25,6 @@
 #include <fnmatch.h>
 #include <glob.h>
 #include <libintl.h>
-#include <limits.h>
 #include <paths.h>
 #include <pwd.h>
 #include <signal.h>
@@ -758,13 +757,8 @@ parse_arith (char **word, size_t *word_length, size_t *max_length,
 		convertme = numresult;
 
 	      result[20] = '\0';
-	      char *numstr;
-#if LLONG_MAX == LONG_MAX
-	      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);
+	      *word = w_addstr (*word, word_length, max_length,
+				_itoa (convertme, &result[20], 10, 0));
 	      free (expr);
 	      return *word ? 0 : WRDE_NOSPACE;
 	    }