projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
utimens: simplify the logic of the previous change
[gnulib.git]
/
tests
/
test-xstrtol.c
diff --git
a/tests/test-xstrtol.c
b/tests/test-xstrtol.c
index
5f09452
..
ed0ac22
100644
(file)
--- a/
tests/test-xstrtol.c
+++ b/
tests/test-xstrtol.c
@@
-1,11
+1,11
@@
/* Test of xstrtol module.
/* Test of xstrtol module.
- Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- 200
6, 2007
Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
2006,
+ 200
7, 2008, 2009, 2010
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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,8
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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>
#include <config.h>
@@
-33,6
+32,12
@@
char *program_name;
char *program_name;
+/* Don't show the program name in error messages. */
+static void
+print_no_progname (void)
+{
+}
+
int
main (int argc, char **argv)
{
int
main (int argc, char **argv)
{
@@
-40,6
+45,8
@@
main (int argc, char **argv)
int i;
program_name = argv[0];
int i;
program_name = argv[0];
+ error_print_progname = print_no_progname;
+
for (i = 1; i < argc; i++)
{
char *p;
for (i = 1; i < argc; i++)
{
char *p;
@@
-47,13
+54,13
@@
main (int argc, char **argv)
s_err = __xstrtol (argv[i], &p, 0, &val, "bckMw0");
if (s_err == LONGINT_OK)
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
else
- {
-
STRTOL_FATAL_ERROR ("arg", argv[i], s_err
);
- }
+
{
+
xstrtol_fatal (s_err, -2, 'X', NULL, argv[i]
);
+
}
}
exit (0);
}
}
exit (0);
}