X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fxstrtol.c;h=1804fe586678ac7ad601cc7c052818a662d4f755;hb=b156173b313f1903489b8c0c74292de350637f5f;hp=af81eae9e6df9236df5aaf59711705ea1440074a;hpb=eef56b544e01755a52fdfbf204e6f2d5800efd21;p=gnulib.git
diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index af81eae9e..1804fe586 100644
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -1,12 +1,12 @@
/* A more useful interface to strtol.
- Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2003, 2004, 2005
- Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+ 2006, 2007 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,17 +14,10 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by Jim Meyering. */
-#if HAVE_CONFIG_H
-# include
-#endif
-
-#include "xstrtol.h"
-
#ifndef __strtol
# define __strtol strtol
# define __strtol_t long int
@@ -33,6 +26,10 @@
# define STRTOL_T_MAXIMUM LONG_MAX
#endif
+#include
+
+#include "xstrtol.h"
+
/* Some pre-ANSI implementations (e.g. SunOS 4)
need stderr defined if assertion checking is enabled. */
#include
@@ -46,27 +43,6 @@
#include "intprops.h"
-#ifndef STRTOL_T_MINIMUM
-# define STRTOL_T_MINIMUM TYPE_MINIMUM (__strtol_t)
-# define STRTOL_T_MAXIMUM TYPE_MAXIMUM (__strtol_t)
-#endif
-
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define IN_CTYPE_DOMAIN(c) 1
-#else
-# define IN_CTYPE_DOMAIN(c) isascii(c)
-#endif
-
-#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
-
-#if !HAVE_DECL_STRTOIMAX && !defined strtoimax
-intmax_t strtoimax ();
-#endif
-
-#if !HAVE_DECL_STRTOUMAX && !defined strtoumax
-uintmax_t strtoumax ();
-#endif
-
static strtol_error
bkm_scale (__strtol_t *x, int scale_factor)
{
@@ -112,7 +88,7 @@ __xstrtol (const char *s, char **ptr, int strtol_base,
{
const char *q = s;
unsigned char ch = *q;
- while (ISSPACE (ch))
+ while (isspace (ch))
ch = *++q;
if (ch == '-')
return LONGINT_INVALID;
@@ -250,37 +226,3 @@ __xstrtol (const char *s, char **ptr, int strtol_base,
*val = tmp;
return err;
}
-
-#ifdef TESTING_XSTRTO
-
-# include
-# include "error.h"
-
-char *program_name;
-
-int
-main (int argc, char **argv)
-{
- strtol_error s_err;
- int i;
-
- program_name = argv[0];
- for (i=1; i%lu (%s)\n", argv[i], val, p);
- }
- else
- {
- STRTOL_FATAL_ERROR (argv[i], "arg", s_err);
- }
- }
- exit (0);
-}
-
-#endif /* TESTING_XSTRTO */