X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-xstrtol.c;h=934689224f6e65e19ce29e39dfa5b196cf471a53;hb=8ea6bf995cf561a525abc8f716e98c8a9b917496;hp=5f09452a547d44a75867d8c297a069347daf15a7;hpb=c7110f3b833159c91e8cbe6a14349174aeef4ab6;p=gnulib.git

diff --git a/tests/test-xstrtol.c b/tests/test-xstrtol.c
index 5f09452a5..934689224 100644
--- a/tests/test-xstrtol.c
+++ b/tests/test-xstrtol.c
@@ -1,11 +1,10 @@
 /* Test of xstrtol module.
-   Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-   2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 1998-2001, 2003-2011 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
@@ -13,8 +12,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -33,6 +31,12 @@
 
 char *program_name;
 
+/* Don't show the program name in error messages.  */
+static void
+print_no_progname (void)
+{
+}
+
 int
 main (int argc, char **argv)
 {
@@ -40,6 +44,8 @@ main (int argc, char **argv)
   int i;
 
   program_name = argv[0];
+  error_print_progname = print_no_progname;
+
   for (i = 1; i < argc; i++)
     {
       char *p;
@@ -47,13 +53,13 @@ main (int argc, char **argv)
 
       s_err = __xstrtol (argv[i], &p, 0, &val, "bckMw0");
       if (s_err == LONGINT_OK)
-	{
-	  printf ("%s->%" __spec " (%s)\n", argv[i], val, p);
-	}
+        {
+          printf ("%s->%" __spec " (%s)\n", argv[i], val, p);
+        }
       else
-	{
-	  STRTOL_FATAL_ERROR ("arg", argv[i], s_err);
-	}
+        {
+          xstrtol_fatal (s_err, -2, 'X', NULL, argv[i]);
+        }
     }
   exit (0);
 }