diff options
| author | Roland McGrath <roland@gnu.org> | 2005-02-16 19:57:14 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-02-16 19:57:14 +0000 |
| commit | 7cd274587760436effbfce65cfdbd51f761acd67 (patch) | |
| tree | 8620654b8197c81aded8a206680e53b4294baccf /iconv | |
| parent | aa29d418cf3ee21f906247b6ab49e8aab6fd19dc (diff) | |
Updated to fedora-glibc-2_3-20050216T1256
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/Makefile | 12 | ||||
| -rw-r--r-- | iconv/iconv_prog.c | 2 | ||||
| -rw-r--r-- | iconv/iconvconfig.c | 2 | ||||
| -rw-r--r-- | iconv/strtab.c | 2 |
4 files changed, 15 insertions, 3 deletions
diff --git a/iconv/Makefile b/iconv/Makefile index fe0c453e7b..40c7cbcdd3 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -78,3 +78,15 @@ $(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 86852857a3..020cc8bc2b 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -424,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\ -"), "2004"); +"), "2005"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c index 0ed210b794..18ff3a53b1 100644 --- a/iconv/iconvconfig.c +++ b/iconv/iconvconfig.c @@ -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\ -"), "2004"); +"), "2005"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/iconv/strtab.c b/iconv/strtab.c index e6feb2cf24..32c00041f3 100644 --- a/iconv/strtab.c +++ b/iconv/strtab.c @@ -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; |