diff options
Diffstat (limited to 'iconv')
-rw-r--r-- | iconv/Makefile | 12 | ||||
-rw-r--r-- | iconv/iconv_prog.c | 16 | ||||
-rw-r--r-- | iconv/iconvconfig.c | 4 | ||||
-rw-r--r-- | iconv/strtab.c | 4 |
4 files changed, 10 insertions, 26 deletions
diff --git a/iconv/Makefile b/iconv/Makefile index 40c7cbcdd3..fe0c453e7b 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -78,15 +78,3 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force) $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o) $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o) - -ifneq ($(cross-compiling),yes) -xtests: test-iconvconfig -endif - -.PHONY: test-iconvconfig -test-iconvconfig: /dev/null $(objpfx)iconvconfig - tmp=$(objpfx)gconv-modules.cache.$$$$; \ - rm -f $$tmp; \ - $(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir) && \ - cmp $$tmp $(inst_gconvdir)/gconv-modules.cache && \ - rm -f $$tmp diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index 5b3d35ecaa..86852857a3 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -1,5 +1,5 @@ /* Convert text in given files from the specified from-set to the to-set. - Copyright (C) 1998-2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1998-2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -239,30 +239,26 @@ main (int argc, char *argv[]) if (from_wrong) { if (to_wrong) - error (0, 0, + error (EXIT_FAILURE, 0, _("\ conversion from `%s' and to `%s' are not supported"), from_pretty, to_pretty); else - error (0, 0, + error (EXIT_FAILURE, 0, _("conversion from `%s' is not supported"), from_pretty); } else { if (to_wrong) - error (0, 0, + error (EXIT_FAILURE, 0, _("conversion to `%s' is not supported"), to_pretty); else - error (0, 0, + error (EXIT_FAILURE, 0, _("conversion from `%s' to `%s' is not supported"), from_pretty, to_pretty); } - - argp_help (&argp, stderr, ARGP_HELP_SEE, - program_invocation_short_name); - exit (1); } else error (EXIT_FAILURE, errno, @@ -428,7 +424,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2005"); +"), "2004"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c index 8c56d29bb0..0ed210b794 100644 --- a/iconv/iconvconfig.c +++ b/iconv/iconvconfig.c @@ -1,5 +1,5 @@ /* Generate fastloading iconv module configuration files. - Copyright (C) 2000-2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2000. @@ -397,7 +397,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2005"); +"), "2004"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/iconv/strtab.c b/iconv/strtab.c index 4a8f29a675..e6feb2cf24 100644 --- a/iconv/strtab.c +++ b/iconv/strtab.c @@ -1,5 +1,5 @@ /* C string table handling. - Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2001 Free Software Foundation, Inc. Written by Ulrich Drepper <drepper@redhat.com>, 2000. This program is free software; you can redistribute it and/or modify @@ -326,7 +326,7 @@ strtabfinalize (struct Strtab *st, size_t *size) copylen = 1; copystrings (st->root, &endp, ©len); assert (copylen == st->total + 1); - assert (endp == retval + st->total + 1); + assert (endp = retval + st->total + 1); *size = copylen; return retval; |