From: Bruno Haible Date: Fri, 17 Oct 2003 10:37:11 +0000 (+0000) Subject: Renamed xmalloc.h to xalloc.h. X-Git-Tag: v0.13~208 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dc13baa80da8ee9c0e755d5a10aef4d8f1e76ef;p=thirdparty%2Fgettext.git Renamed xmalloc.h to xalloc.h. --- diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index a330354db..f6ce5efee 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,7 @@ +2003-10-09 Bruno Haible + + * relocatable.c: Include xalloc.h instead of xmalloc.h. + 2003-10-07 Bruno Haible Assume ANSI C. diff --git a/gettext-runtime/intl/relocatable.c b/gettext-runtime/intl/relocatable.c index fa5e5f3ea..bf7c70854 100644 --- a/gettext-runtime/intl/relocatable.c +++ b/gettext-runtime/intl/relocatable.c @@ -42,7 +42,7 @@ #ifdef NO_XMALLOC # define xmalloc malloc #else -# include "xmalloc.h" +# include "xalloc.h" #endif #if defined _WIN32 || defined __WIN32__ diff --git a/gettext-runtime/lib/ChangeLog b/gettext-runtime/lib/ChangeLog index e8649edaa..10fa0395e 100644 --- a/gettext-runtime/lib/ChangeLog +++ b/gettext-runtime/lib/ChangeLog @@ -1,3 +1,7 @@ +2003-10-09 Bruno Haible + + * Makefile.am (libgrt_a_SOURCES): Use xalloc.h instead of xmalloc.h. + 2003-09-16 Bruno Haible Portability to SunOS 4. diff --git a/gettext-runtime/lib/Makefile.am b/gettext-runtime/lib/Makefile.am index 0a09dcfb1..2edd7b2a4 100644 --- a/gettext-runtime/lib/Makefile.am +++ b/gettext-runtime/lib/Makefile.am @@ -36,7 +36,7 @@ libgrt_a_SOURCES = \ ../../gettext-tools/lib/progname.h ../../gettext-tools/lib/progname.c ../../gettext-tools/lib/progreloc.c \ ../../gettext-tools/lib/strtoul.c \ ../../gettext-tools/lib/unlocked-io.h \ - ../../gettext-tools/lib/xmalloc.h ../../gettext-tools/lib/xmalloc.c ../../gettext-tools/lib/xstrdup.c \ + ../../gettext-tools/lib/xalloc.h ../../gettext-tools/lib/xmalloc.c ../../gettext-tools/lib/xstrdup.c \ ../../gettext-tools/lib/xreadlink.h ../../gettext-tools/lib/xreadlink.c # Sources that are compiled only on platforms that lack the functions. diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog index c49c4fa06..ad633014b 100644 --- a/gettext-runtime/src/ChangeLog +++ b/gettext-runtime/src/ChangeLog @@ -1,3 +1,9 @@ +2003-10-09 Bruno Haible + + * envsubst.c: Include xalloc.h instead of xmalloc.h. + * gettext.c: Likewise. + * ngettext.c: Likewise. + 2003-09-16 Bruno Haible * envsubst.c: Include stdbool.h. diff --git a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c index 7bb68fe69..f0cda0511 100644 --- a/gettext-runtime/src/envsubst.c +++ b/gettext-runtime/src/envsubst.c @@ -33,7 +33,7 @@ #include "progname.h" #include "relocatable.h" #include "basename.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "gettext.h" diff --git a/gettext-runtime/src/gettext.c b/gettext-runtime/src/gettext.c index 088a4f6dc..4a9dad4af 100644 --- a/gettext-runtime/src/gettext.c +++ b/gettext-runtime/src/gettext.c @@ -32,7 +32,7 @@ #include "progname.h" #include "relocatable.h" #include "basename.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "gettext.h" diff --git a/gettext-runtime/src/ngettext.c b/gettext-runtime/src/ngettext.c index f0dbd9608..503cab25e 100644 --- a/gettext-runtime/src/ngettext.c +++ b/gettext-runtime/src/ngettext.c @@ -32,7 +32,7 @@ #include "progname.h" #include "relocatable.h" #include "basename.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "gettext.h" diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog index 9bb2b87fe..7ebf14910 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,3 +1,28 @@ +2003-10-09 Bruno Haible + + * xalloc.h: Renamed from xmalloc.h. + * classpath.c: Include xalloc.h instead of xmalloc.h. + * concatpath.c: Likewise. + * fatal-signal.c: Likewise. + * findprog.c: Likewise. + * fstrcmp.c: Likewise. + * hash.c: Likewise. + * javacomp.c: Likewise. + * javaexec.c: Likewise. + * progreloc.c: Likewise. + * relocatable.c: Likewise. + * sh-quote.c: Likewise. + * w32spawn.h: Likewise. + * wait-process.c: Likewise. + * xgetcwd.c: Likewise. + * xmalloc.c: Likewise. + * xreadlink.c: Likewise. + * xstrdup.c: Likewise. + * Makefile.am (libgettextlib_la_SOURCES): Use xalloc.h instead of + xmalloc.h. + * Makefile.msvc: Reorder accordingly. + * Makefile.vms: Likewise. + 2003-10-07 Bruno Haible More reliable subprocess cleanup. diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am index ce4cf6ccf..d947f015c 100644 --- a/gettext-tools/lib/Makefile.am +++ b/gettext-tools/lib/Makefile.am @@ -70,8 +70,8 @@ libgettextlib_la_SOURCES = \ ucs4-utf8.h ucs4-utf16.h \ unlocked-io.h \ wait-process.h wait-process.c \ + xalloc.h xmalloc.c xstrdup.c \ xerror.h xerror.c \ - xmalloc.h xmalloc.c xstrdup.c \ xreadlink.h xreadlink.c \ xsetenv.h xsetenv.c diff --git a/gettext-tools/lib/Makefile.msvc b/gettext-tools/lib/Makefile.msvc index a219e557f..536df53e6 100644 --- a/gettext-tools/lib/Makefile.msvc +++ b/gettext-tools/lib/Makefile.msvc @@ -113,8 +113,8 @@ OBJECTS = \ strtoul.obj \ tmpdir.obj \ wait-process.obj \ + xalloc.obj xstrdup.obj \ xerror.obj \ - xmalloc.obj xstrdup.obj \ xsetenv.obj \ \ fnmatch.obj \ @@ -245,15 +245,15 @@ tmpdir.obj : tmpdir.c wait-process.obj : wait-process.c $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c wait-process.c -xerror.obj : xerror.c - $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xerror.c - xmalloc.obj : xmalloc.c $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xmalloc.c xstrdup.obj : xstrdup.c $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xstrdup.c +xerror.obj : xerror.c + $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xerror.c + xsetenv.obj : xsetenv.c $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xsetenv.c diff --git a/gettext-tools/lib/Makefile.vms b/gettext-tools/lib/Makefile.vms index 68d4923e7..df74b4a00 100644 --- a/gettext-tools/lib/Makefile.vms +++ b/gettext-tools/lib/Makefile.vms @@ -71,8 +71,8 @@ OBJECTS = \ strtoul.obj, \ tmpdir.obj, \ wait-process.obj, \ - xerror.obj, \ xmalloc.obj, xstrdup.obj, \ + xerror.obj, \ xsetenv.obj, \ \ fnmatch.obj, \ @@ -206,15 +206,15 @@ tmpdir.obj : tmpdir.c wait-process.obj : wait-process.c $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) wait-process.c -xerror.obj : xerror.c - $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xerror.c - xmalloc.obj : xmalloc.c $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xmalloc.c xstrdup.obj : xstrdup.c $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xstrdup.c +xerror.obj : xerror.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xerror.c + xsetenv.obj : xsetenv.c $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xsetenv.c diff --git a/gettext-tools/lib/classpath.c b/gettext-tools/lib/classpath.c index ae88a3d67..28393f736 100644 --- a/gettext-tools/lib/classpath.c +++ b/gettext-tools/lib/classpath.c @@ -28,7 +28,7 @@ #include #include "xsetenv.h" -#include "xmalloc.h" +#include "xalloc.h" /* Separator in PATH like lists of pathnames. */ #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ diff --git a/gettext-tools/lib/concatpath.c b/gettext-tools/lib/concatpath.c index d57f96510..cce81d679 100644 --- a/gettext-tools/lib/concatpath.c +++ b/gettext-tools/lib/concatpath.c @@ -1,5 +1,5 @@ /* Construct a full pathname from a directory and a filename. - Copyright (C) 2001-2002 Free Software Foundation, Inc. + Copyright (C) 2001-2003 Free Software Foundation, Inc. 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 @@ -27,7 +27,7 @@ #include -#include "xmalloc.h" +#include "xalloc.h" #include "stpcpy.h" /* Concatenate a directory pathname, a relative pathname and an optional diff --git a/gettext-tools/lib/fatal-signal.c b/gettext-tools/lib/fatal-signal.c index 107da661a..8718fd606 100644 --- a/gettext-tools/lib/fatal-signal.c +++ b/gettext-tools/lib/fatal-signal.c @@ -32,7 +32,7 @@ # include #endif -#include "xmalloc.h" +#include "xalloc.h" #define SIZEOF(a) (sizeof(a) / sizeof(a[0])) diff --git a/gettext-tools/lib/findprog.c b/gettext-tools/lib/findprog.c index b820a8303..48c3edf6c 100644 --- a/gettext-tools/lib/findprog.c +++ b/gettext-tools/lib/findprog.c @@ -32,7 +32,7 @@ # include #endif -#include "xmalloc.h" +#include "xalloc.h" #include "pathname.h" diff --git a/gettext-tools/lib/fstrcmp.c b/gettext-tools/lib/fstrcmp.c index e56e04e63..b8a4a4107 100644 --- a/gettext-tools/lib/fstrcmp.c +++ b/gettext-tools/lib/fstrcmp.c @@ -46,7 +46,7 @@ #include #include -#include "xmalloc.h" +#include "xalloc.h" /* diff --git a/gettext-tools/lib/hash.c b/gettext-tools/lib/hash.c index 5eb480fbf..a4b88f459 100644 --- a/gettext-tools/lib/hash.c +++ b/gettext-tools/lib/hash.c @@ -1,5 +1,5 @@ /* hash - implement simple hashing table with string based keys. - Copyright (C) 1994-1995, 2000-2002 Free Software Foundation, Inc. + Copyright (C) 1994-1995, 2000-2003 Free Software Foundation, Inc. Written by Ulrich Drepper , October 1994. This program is free software; you can redistribute it and/or modify @@ -50,7 +50,7 @@ # include #endif -#include "xmalloc.h" +#include "xalloc.h" #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free diff --git a/gettext-tools/lib/javacomp.c b/gettext-tools/lib/javacomp.c index 73afa2c15..6f50a1d82 100644 --- a/gettext-tools/lib/javacomp.c +++ b/gettext-tools/lib/javacomp.c @@ -35,7 +35,7 @@ #include "xsetenv.h" #include "sh-quote.h" #include "safe-read.h" -#include "xmalloc.h" +#include "xalloc.h" #include "error.h" #include "gettext.h" diff --git a/gettext-tools/lib/javaexec.c b/gettext-tools/lib/javaexec.c index 40f5d6ccf..ab218de32 100644 --- a/gettext-tools/lib/javaexec.c +++ b/gettext-tools/lib/javaexec.c @@ -33,7 +33,7 @@ #include "xsetenv.h" #include "sh-quote.h" #include "pathname.h" -#include "xmalloc.h" +#include "xalloc.h" #include "error.h" #include "gettext.h" diff --git a/gettext-tools/lib/progreloc.c b/gettext-tools/lib/progreloc.c index 13ecb436e..fbf36eee7 100644 --- a/gettext-tools/lib/progreloc.c +++ b/gettext-tools/lib/progreloc.c @@ -52,7 +52,7 @@ #ifdef NO_XMALLOC # define xmalloc malloc #else -# include "xmalloc.h" +# include "xalloc.h" #endif /* Pathname support. diff --git a/gettext-tools/lib/relocatable.c b/gettext-tools/lib/relocatable.c index fa5e5f3ea..bf7c70854 100644 --- a/gettext-tools/lib/relocatable.c +++ b/gettext-tools/lib/relocatable.c @@ -42,7 +42,7 @@ #ifdef NO_XMALLOC # define xmalloc malloc #else -# include "xmalloc.h" +# include "xalloc.h" #endif #if defined _WIN32 || defined __WIN32__ diff --git a/gettext-tools/lib/sh-quote.c b/gettext-tools/lib/sh-quote.c index 4052aba1d..b723c30bf 100644 --- a/gettext-tools/lib/sh-quote.c +++ b/gettext-tools/lib/sh-quote.c @@ -26,7 +26,7 @@ #include #include "strpbrk.h" -#include "xmalloc.h" +#include "xalloc.h" /* Must quote the program name and arguments since Unix shells interpret diff --git a/gettext-tools/lib/w32spawn.h b/gettext-tools/lib/w32spawn.h index ac3792678..18e64d7d5 100644 --- a/gettext-tools/lib/w32spawn.h +++ b/gettext-tools/lib/w32spawn.h @@ -27,7 +27,7 @@ #include #include "strpbrk.h" -#include "xmalloc.h" +#include "xalloc.h" /* Duplicates a file handle, making the copy uninheritable. */ static int diff --git a/gettext-tools/lib/wait-process.c b/gettext-tools/lib/wait-process.c index 9a2037f4d..138f25c64 100644 --- a/gettext-tools/lib/wait-process.c +++ b/gettext-tools/lib/wait-process.c @@ -93,7 +93,7 @@ #include "error.h" #include "exit.h" #include "fatal-signal.h" -#include "xmalloc.h" +#include "xalloc.h" #include "gettext.h" #define _(str) gettext (str) diff --git a/gettext-tools/lib/xgetcwd.c b/gettext-tools/lib/xgetcwd.c index 4e6c11e8c..b304f6a61 100644 --- a/gettext-tools/lib/xgetcwd.c +++ b/gettext-tools/lib/xgetcwd.c @@ -47,7 +47,7 @@ char *getwd (); # define getcwd(Buf, Max) getwd (Buf) #endif -#include "xmalloc.h" +#include "xalloc.h" /* Return the current directory, newly allocated, arbitrarily long. Return NULL and set errno on error. */ diff --git a/gettext-tools/lib/xmalloc.c b/gettext-tools/lib/xmalloc.c index 0f6577989..12a0058fb 100644 --- a/gettext-tools/lib/xmalloc.c +++ b/gettext-tools/lib/xmalloc.c @@ -20,7 +20,7 @@ #endif /* Specification. */ -#include "xmalloc.h" +#include "xalloc.h" #include diff --git a/gettext-tools/lib/xreadlink.c b/gettext-tools/lib/xreadlink.c index 2d6b8f078..ff16b06f2 100644 --- a/gettext-tools/lib/xreadlink.c +++ b/gettext-tools/lib/xreadlink.c @@ -53,7 +53,7 @@ extern int errno; #ifdef NO_XMALLOC # define xmalloc malloc #else -# include "xmalloc.h" +# include "xalloc.h" #endif /* Call readlink to get the symbolic link value of FILENAME. diff --git a/gettext-tools/lib/xstrdup.c b/gettext-tools/lib/xstrdup.c index 6d20e2b55..4ed1766d2 100644 --- a/gettext-tools/lib/xstrdup.c +++ b/gettext-tools/lib/xstrdup.c @@ -1,5 +1,5 @@ /* xstrdup.c -- copy a string with out of memory checking - Copyright (C) 1990, 1996, 2000-2002 Free Software Foundation, Inc. + Copyright (C) 1990, 1996, 2000-2003 Free Software Foundation, Inc. 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 @@ -20,7 +20,7 @@ #endif /* Specification. */ -#include "xmalloc.h" +#include "xalloc.h" #include diff --git a/gettext-tools/libuniname/ChangeLog b/gettext-tools/libuniname/ChangeLog index f535dbe79..0e1a4b063 100644 --- a/gettext-tools/libuniname/ChangeLog +++ b/gettext-tools/libuniname/ChangeLog @@ -1,3 +1,7 @@ +2003-10-09 Bruno Haible + + * test-names.c: Include xalloc.h instead of xmalloc.h. + 2003-05-22 Bruno Haible * gettext-0.12.1 released. diff --git a/gettext-tools/libuniname/test-names.c b/gettext-tools/libuniname/test-names.c index 19a757c54..46326dbb3 100644 --- a/gettext-tools/libuniname/test-names.c +++ b/gettext-tools/libuniname/test-names.c @@ -1,5 +1,5 @@ /* Test the Unicode character name functions. - Copyright (C) 2000-2002 Free Software Foundation, Inc. + Copyright (C) 2000-2003 Free Software Foundation, Inc. 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 @@ -24,7 +24,7 @@ #include #include "exit.h" -#include "xmalloc.h" +#include "xalloc.h" #include "uniname.h" /* The names according to the UnicodeData.txt file, modified to contain the diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 338a254b8..3980214c7 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,64 @@ +2003-10-09 Bruno Haible + + * format-awk.c: Include xalloc.h instead of xmalloc.h. + * format-c.c: Likewise. + * format-elisp.c: Likewise. + * format-gcc-internal.c: Likewise. + * format-java.c: Likewise. + * format-librep.c: Likewise. + * format-lisp.c: Likewise. + * format-pascal.c: Likewise. + * format-perl.c: Likewise. + * format-perl-brace.c: Likewise. + * format-php.c: Likewise. + * format-python.c: Likewise. + * format-sh.c: Likewise. + * format-tcl.c: Likewise. + * format-ycp.c: Likewise. + * gettext-po.c: Likewise. + * hostname.c: Likewise. + * message.c: Likewise. + * msgexec.c: Likewise. + * msgfilter.c: Likewise. + * msgfmt.c: Likewise. + * msggrep.c: Likewise. + * msginit.c: Likewise. + * msgl-cat.c: Likewise. + * msgl-english.c: Likewise. + * msgl-iconv.c: Likewise. + * msgmerge.c: Likewise. + * open-po.c: Likewise. + * po-gram-gen.y: Likewise. + * po-hash-gen.y: Likewise. + * po-lex.c: Likewise. + * read-mo.c: Likewise. + * read-po-abstract.c: Likewise. + * read-po.c: Likewise. + * read-properties.c: Likewise. + * str-list.c: Likewise. + * write-java.c: Likewise. + * write-mo.c: Likewise. + * write-po.c: Likewise. + * write-properties.c: Likewise. + * write-tcl.c: Likewise. + * x-awk.c: Likewise. + * x-c.c: Likewise. + * x-elisp.c: Likewise. + * x-glade.c: Likewise. + * x-java.c: Likewise. + * x-librep.c: Likewise. + * x-lisp.c: Likewise. + * x-perl.c: Likewise. + * x-php.c: Likewise. + * x-po.c: Likewise. + * x-python.c: Likewise. + * x-rst.c: Likewise. + * x-sh.c: Likewise. + * x-smalltalk.c: Likewise. + * x-tcl.c: Likewise. + * x-ycp.c: Likewise. + * xgettext.c: Likewise. + 2003-10-07 Bruno Haible More reliable subprocess cleanup. diff --git a/gettext-tools/src/format-awk.c b/gettext-tools/src/format-awk.c index 902a7fbed..eccc81acc 100644 --- a/gettext-tools/src/format-awk.c +++ b/gettext-tools/src/format-awk.c @@ -25,7 +25,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "error.h" diff --git a/gettext-tools/src/format-c.c b/gettext-tools/src/format-c.c index ca17288f4..9452ddf85 100644 --- a/gettext-tools/src/format-c.c +++ b/gettext-tools/src/format-c.c @@ -25,7 +25,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "error.h" diff --git a/gettext-tools/src/format-elisp.c b/gettext-tools/src/format-elisp.c index d25bec032..c050fa6ea 100644 --- a/gettext-tools/src/format-elisp.c +++ b/gettext-tools/src/format-elisp.c @@ -25,7 +25,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "error.h" diff --git a/gettext-tools/src/format-gcc-internal.c b/gettext-tools/src/format-gcc-internal.c index 10218d03c..8a84d2c02 100644 --- a/gettext-tools/src/format-gcc-internal.c +++ b/gettext-tools/src/format-gcc-internal.c @@ -25,7 +25,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "error.h" diff --git a/gettext-tools/src/format-java.c b/gettext-tools/src/format-java.c index f20684bba..74256876b 100644 --- a/gettext-tools/src/format-java.c +++ b/gettext-tools/src/format-java.c @@ -27,7 +27,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "error.h" diff --git a/gettext-tools/src/format-librep.c b/gettext-tools/src/format-librep.c index 334c62a6c..6380dd62b 100644 --- a/gettext-tools/src/format-librep.c +++ b/gettext-tools/src/format-librep.c @@ -25,7 +25,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "error.h" diff --git a/gettext-tools/src/format-lisp.c b/gettext-tools/src/format-lisp.c index 067d9b111..14903fc57 100644 --- a/gettext-tools/src/format-lisp.c +++ b/gettext-tools/src/format-lisp.c @@ -26,7 +26,7 @@ #include "format.h" #include "c-ctype.h" #include "gcd.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "minmax.h" diff --git a/gettext-tools/src/format-pascal.c b/gettext-tools/src/format-pascal.c index 8af67d980..0775d3ccb 100644 --- a/gettext-tools/src/format-pascal.c +++ b/gettext-tools/src/format-pascal.c @@ -25,7 +25,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "error.h" diff --git a/gettext-tools/src/format-perl-brace.c b/gettext-tools/src/format-perl-brace.c index 97aba83ff..26149d8de 100644 --- a/gettext-tools/src/format-perl-brace.c +++ b/gettext-tools/src/format-perl-brace.c @@ -25,7 +25,7 @@ #include #include "format.h" -#include "xmalloc.h" +#include "xalloc.h" #include "error.h" #include "error-progname.h" #include "gettext.h" diff --git a/gettext-tools/src/format-perl.c b/gettext-tools/src/format-perl.c index 64933fd38..71711d764 100644 --- a/gettext-tools/src/format-perl.c +++ b/gettext-tools/src/format-perl.c @@ -25,7 +25,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "error.h" diff --git a/gettext-tools/src/format-php.c b/gettext-tools/src/format-php.c index 9c9bdb944..d76698484 100644 --- a/gettext-tools/src/format-php.c +++ b/gettext-tools/src/format-php.c @@ -25,7 +25,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "error.h" diff --git a/gettext-tools/src/format-python.c b/gettext-tools/src/format-python.c index f01f37361..d41adfe90 100644 --- a/gettext-tools/src/format-python.c +++ b/gettext-tools/src/format-python.c @@ -26,7 +26,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "error.h" diff --git a/gettext-tools/src/format-sh.c b/gettext-tools/src/format-sh.c index ae351b75d..798d3d0fa 100644 --- a/gettext-tools/src/format-sh.c +++ b/gettext-tools/src/format-sh.c @@ -26,7 +26,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "format-invalid.h" #include "error.h" #include "error-progname.h" diff --git a/gettext-tools/src/format-tcl.c b/gettext-tools/src/format-tcl.c index 4f1ff2fca..0b3e871cf 100644 --- a/gettext-tools/src/format-tcl.c +++ b/gettext-tools/src/format-tcl.c @@ -25,7 +25,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "error.h" diff --git a/gettext-tools/src/format-ycp.c b/gettext-tools/src/format-ycp.c index ba395187c..6300e97bb 100644 --- a/gettext-tools/src/format-ycp.c +++ b/gettext-tools/src/format-ycp.c @@ -25,7 +25,7 @@ #include "format.h" #include "c-ctype.h" -#include "xmalloc.h" +#include "xalloc.h" #include "xerror.h" #include "format-invalid.h" #include "error.h" diff --git a/gettext-tools/src/gettext-po.c b/gettext-tools/src/gettext-po.c index 4e71e6237..611a2fbd8 100644 --- a/gettext-tools/src/gettext-po.c +++ b/gettext-tools/src/gettext-po.c @@ -27,7 +27,7 @@ #include #include "message.h" -#include "xmalloc.h" +#include "xalloc.h" #include "read-po.h" diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c index 8b4902bbb..854087b6c 100644 --- a/gettext-tools/src/hostname.c +++ b/gettext-tools/src/hostname.c @@ -83,7 +83,7 @@ #include "progname.h" #include "relocatable.h" #include "basename.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "gettext.h" diff --git a/gettext-tools/src/message.c b/gettext-tools/src/message.c index 505567aec..4ed130915 100644 --- a/gettext-tools/src/message.c +++ b/gettext-tools/src/message.c @@ -29,7 +29,7 @@ #include "fstrcmp.h" #include "hash.h" -#include "xmalloc.h" +#include "xalloc.h" const char *const format_language[NFORMATS] = diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c index 3d2f34474..66e6331d7 100644 --- a/gettext-tools/src/msgexec.c +++ b/gettext-tools/src/msgexec.c @@ -43,7 +43,7 @@ #include "basename.h" #include "message.h" #include "read-po.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "full-write.h" #include "findprog.h" diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c index 7cdd1f05a..b3e4911b8 100644 --- a/gettext-tools/src/msgfilter.c +++ b/gettext-tools/src/msgfilter.c @@ -57,7 +57,7 @@ #include "read-po.h" #include "write-po.h" #include "msgl-charset.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "findprog.h" #include "pipe.h" diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c index 9830701d1..5d2460811 100644 --- a/gettext-tools/src/msgfmt.c +++ b/gettext-tools/src/msgfmt.c @@ -39,7 +39,7 @@ #include "basename.h" #include "xerror.h" #include "format.h" -#include "xmalloc.h" +#include "xalloc.h" #include "plural-exp.h" #include "plural-table.h" #include "strstr.h" diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c index 06c9cbe8d..1fc10a961 100644 --- a/gettext-tools/src/msggrep.c +++ b/gettext-tools/src/msggrep.c @@ -50,7 +50,7 @@ #include "write-po.h" #include "str-list.h" #include "msgl-charset.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "full-write.h" #include "findprog.h" diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c index 9fc3a6ff8..fb63147f2 100644 --- a/gettext-tools/src/msginit.c +++ b/gettext-tools/src/msginit.c @@ -85,7 +85,7 @@ #include "localcharset.h" #include "po-time.h" #include "plural-table.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "pathname.h" #include "xerror.h" diff --git a/gettext-tools/src/msgl-cat.c b/gettext-tools/src/msgl-cat.c index bfb83a411..c6d9742b0 100644 --- a/gettext-tools/src/msgl-cat.c +++ b/gettext-tools/src/msgl-cat.c @@ -37,7 +37,7 @@ #include "msgl-ascii.h" #include "msgl-equal.h" #include "msgl-iconv.h" -#include "xmalloc.h" +#include "xalloc.h" #include "strstr.h" #include "basename.h" #include "exit.h" diff --git a/gettext-tools/src/msgl-english.c b/gettext-tools/src/msgl-english.c index 8c92df628..6dfecdf6e 100644 --- a/gettext-tools/src/msgl-english.c +++ b/gettext-tools/src/msgl-english.c @@ -1,5 +1,5 @@ /* Message translation initialization for English. - Copyright (C) 2001-2002 Free Software Foundation, Inc. + Copyright (C) 2001-2003 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software; you can redistribute it and/or modify @@ -26,7 +26,7 @@ #include -#include "xmalloc.h" +#include "xalloc.h" msgdomain_list_ty * diff --git a/gettext-tools/src/msgl-iconv.c b/gettext-tools/src/msgl-iconv.c index e32c6bf2e..1c04edc54 100644 --- a/gettext-tools/src/msgl-iconv.c +++ b/gettext-tools/src/msgl-iconv.c @@ -40,7 +40,7 @@ #include "message.h" #include "po-charset.h" #include "msgl-ascii.h" -#include "xmalloc.h" +#include "xalloc.h" #include "strstr.h" #include "exit.h" #include "gettext.h" diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c index 91fa41687..658cfd6f0 100644 --- a/gettext-tools/src/msgmerge.c +++ b/gettext-tools/src/msgmerge.c @@ -40,7 +40,7 @@ #include "read-po.h" #include "write-po.h" #include "format.h" -#include "xmalloc.h" +#include "xalloc.h" #include "strstr.h" #include "exit.h" #include "strcase.h" diff --git a/gettext-tools/src/open-po.c b/gettext-tools/src/open-po.c index 8e7308175..df63bb929 100644 --- a/gettext-tools/src/open-po.c +++ b/gettext-tools/src/open-po.c @@ -31,7 +31,7 @@ #include "dir-list.h" #include "pathname.h" -#include "xmalloc.h" +#include "xalloc.h" #include "error.h" #include "gettext.h" diff --git a/gettext-tools/src/po-gram-gen.y b/gettext-tools/src/po-gram-gen.y index e8386bb11..29624223f 100644 --- a/gettext-tools/src/po-gram-gen.y +++ b/gettext-tools/src/po-gram-gen.y @@ -34,7 +34,7 @@ #include "po-lex.h" #include "po-charset.h" #include "error.h" -#include "xmalloc.h" +#include "xalloc.h" #include "gettext.h" #include "read-po-abstract.h" diff --git a/gettext-tools/src/po-hash-gen.y b/gettext-tools/src/po-hash-gen.y index 71f40ac04..f42d47a5c 100644 --- a/gettext-tools/src/po-hash-gen.y +++ b/gettext-tools/src/po-hash-gen.y @@ -39,7 +39,7 @@ #include #include -#include "xmalloc.h" +#include "xalloc.h" #include "read-po-abstract.h" /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc), diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c index a7d58015a..8a5597827 100644 --- a/gettext-tools/src/po-lex.c +++ b/gettext-tools/src/po-lex.c @@ -42,7 +42,7 @@ #include "vasprintf.h" #include "gettext.h" #include "po-charset.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "error.h" #include "error-progname.h" diff --git a/gettext-tools/src/read-mo.c b/gettext-tools/src/read-mo.c index 5c0e72e86..fd2e83234 100644 --- a/gettext-tools/src/read-mo.c +++ b/gettext-tools/src/read-mo.c @@ -1,5 +1,5 @@ /* Reading binary .mo files. - Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc. Written by Ulrich Drepper , April 1995. This program is free software; you can redistribute it and/or modify @@ -32,7 +32,7 @@ #include "gmo.h" #include "error.h" -#include "xmalloc.h" +#include "xalloc.h" #include "binary-io.h" #include "exit.h" #include "message.h" diff --git a/gettext-tools/src/read-po-abstract.c b/gettext-tools/src/read-po-abstract.c index bc562eae2..1b02a1cb4 100644 --- a/gettext-tools/src/read-po-abstract.c +++ b/gettext-tools/src/read-po-abstract.c @@ -31,7 +31,7 @@ #include "po-gram.h" #include "po-hash.h" #include "read-properties.h" -#include "xmalloc.h" +#include "xalloc.h" #include "gettext.h" /* Local variables. */ diff --git a/gettext-tools/src/read-po.c b/gettext-tools/src/read-po.c index a31c55ad8..e80635d6e 100644 --- a/gettext-tools/src/read-po.c +++ b/gettext-tools/src/read-po.c @@ -29,7 +29,7 @@ #include "open-po.h" #include "po-charset.h" -#include "xmalloc.h" +#include "xalloc.h" #include "gettext.h" #define _(str) gettext (str) diff --git a/gettext-tools/src/read-properties.c b/gettext-tools/src/read-properties.c index 3b94fa215..e95b787e6 100644 --- a/gettext-tools/src/read-properties.c +++ b/gettext-tools/src/read-properties.c @@ -34,7 +34,7 @@ #include "error-progname.h" #include "message.h" #include "read-po-abstract.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "msgl-ascii.h" #include "utf16-ucs4.h" diff --git a/gettext-tools/src/str-list.c b/gettext-tools/src/str-list.c index 094329c55..fb3244326 100644 --- a/gettext-tools/src/str-list.c +++ b/gettext-tools/src/str-list.c @@ -28,7 +28,7 @@ #include #include -#include "xmalloc.h" +#include "xalloc.h" /* Initialize an empty list of strings. */ diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c index 187b34dd5..104a61c59 100644 --- a/gettext-tools/src/write-java.c +++ b/gettext-tools/src/write-java.c @@ -71,7 +71,7 @@ #include "pathmax.h" #include "plural-exp.h" #include "po-charset.h" -#include "xmalloc.h" +#include "xalloc.h" #include "pathname.h" #include "fatal-signal.h" #include "fwriteerror.h" diff --git a/gettext-tools/src/write-mo.c b/gettext-tools/src/write-mo.c index adba88388..4efdf0d11 100644 --- a/gettext-tools/src/write-mo.c +++ b/gettext-tools/src/write-mo.c @@ -42,7 +42,7 @@ #include "hash.h" #include "message.h" #include "format.h" -#include "xmalloc.h" +#include "xalloc.h" #include "binary-io.h" #include "fwriteerror.h" #include "exit.h" diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c index ef5a04fe9..90782683a 100644 --- a/gettext-tools/src/write-po.c +++ b/gettext-tools/src/write-po.c @@ -40,7 +40,7 @@ #include "linebreak.h" #include "msgl-ascii.h" #include "write-properties.h" -#include "xmalloc.h" +#include "xalloc.h" #include "strstr.h" #include "fwriteerror.h" #include "exit.h" diff --git a/gettext-tools/src/write-properties.c b/gettext-tools/src/write-properties.c index 5328ebc66..ff3e893cb 100644 --- a/gettext-tools/src/write-properties.c +++ b/gettext-tools/src/write-properties.c @@ -36,7 +36,7 @@ #include "po-charset.h" #include "utf8-ucs4.h" #include "write-po.h" -#include "xmalloc.h" +#include "xalloc.h" /* The format of the Java .properties files is documented in the JDK documentation for class java.util.Properties. In the case of .properties diff --git a/gettext-tools/src/write-tcl.c b/gettext-tools/src/write-tcl.c index 4b0146bf1..9b8b8f7df 100644 --- a/gettext-tools/src/write-tcl.c +++ b/gettext-tools/src/write-tcl.c @@ -34,7 +34,7 @@ #include "message.h" #include "msgl-iconv.h" #include "po-charset.h" -#include "xmalloc.h" +#include "xalloc.h" #include "pathname.h" #include "fwriteerror.h" #include "exit.h" diff --git a/gettext-tools/src/x-awk.c b/gettext-tools/src/x-awk.c index b3296210a..933daedd0 100644 --- a/gettext-tools/src/x-awk.c +++ b/gettext-tools/src/x-awk.c @@ -32,7 +32,7 @@ #include "x-awk.h" #include "error.h" #include "error-progname.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "gettext.h" diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c index b7f83446a..434d7434f 100644 --- a/gettext-tools/src/x-c.c +++ b/gettext-tools/src/x-c.c @@ -32,7 +32,7 @@ #include "x-c.h" #include "error.h" #include "error-progname.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "hash.h" #include "gettext.h" diff --git a/gettext-tools/src/x-elisp.c b/gettext-tools/src/x-elisp.c index bde71c1d4..d1ecabc7b 100644 --- a/gettext-tools/src/x-elisp.c +++ b/gettext-tools/src/x-elisp.c @@ -31,7 +31,7 @@ #include "xgettext.h" #include "x-elisp.h" #include "error.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "hash.h" #include "c-ctype.h" diff --git a/gettext-tools/src/x-glade.c b/gettext-tools/src/x-glade.c index 38a2a903c..9bc310767 100644 --- a/gettext-tools/src/x-glade.c +++ b/gettext-tools/src/x-glade.c @@ -41,7 +41,7 @@ #include "xerror.h" #include "basename.h" #include "progname.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "hash.h" #include "po-charset.h" diff --git a/gettext-tools/src/x-java.c b/gettext-tools/src/x-java.c index 68452fc9f..9652c98f2 100644 --- a/gettext-tools/src/x-java.c +++ b/gettext-tools/src/x-java.c @@ -30,7 +30,7 @@ #include "xgettext.h" #include "x-java.h" #include "error.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "hash.h" #include "po-charset.h" diff --git a/gettext-tools/src/x-librep.c b/gettext-tools/src/x-librep.c index 78858929e..106b80867 100644 --- a/gettext-tools/src/x-librep.c +++ b/gettext-tools/src/x-librep.c @@ -32,7 +32,7 @@ #include "xgettext.h" #include "x-librep.h" #include "error.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "hash.h" #include "gettext.h" diff --git a/gettext-tools/src/x-lisp.c b/gettext-tools/src/x-lisp.c index 4a1e7bff9..0c687ee9a 100644 --- a/gettext-tools/src/x-lisp.c +++ b/gettext-tools/src/x-lisp.c @@ -31,7 +31,7 @@ #include "xgettext.h" #include "x-lisp.h" #include "error.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "hash.h" #include "gettext.h" diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c index 3928cf6ed..86ae68f35 100644 --- a/gettext-tools/src/x-perl.c +++ b/gettext-tools/src/x-perl.c @@ -32,7 +32,7 @@ #include "x-perl.h" #include "error.h" #include "error-progname.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "po-charset.h" #include "ucs4-utf8.h" diff --git a/gettext-tools/src/x-php.c b/gettext-tools/src/x-php.c index f45806f6f..6a8310be3 100644 --- a/gettext-tools/src/x-php.c +++ b/gettext-tools/src/x-php.c @@ -30,7 +30,7 @@ #include "xgettext.h" #include "x-php.h" #include "error.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "gettext.h" diff --git a/gettext-tools/src/x-po.c b/gettext-tools/src/x-po.c index 3c55a476a..594531550 100644 --- a/gettext-tools/src/x-po.c +++ b/gettext-tools/src/x-po.c @@ -30,7 +30,7 @@ #include "xgettext.h" #include "x-po.h" #include "x-properties.h" -#include "xmalloc.h" +#include "xalloc.h" #include "read-po.h" #include "po-lex.h" #include "gettext.h" diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c index c007eae1b..8b19d8253 100644 --- a/gettext-tools/src/x-python.c +++ b/gettext-tools/src/x-python.c @@ -33,7 +33,7 @@ #include "x-python.h" #include "error.h" #include "error-progname.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "po-charset.h" #include "uniname.h" diff --git a/gettext-tools/src/x-rst.c b/gettext-tools/src/x-rst.c index 2e4dc8b6c..20eef828f 100644 --- a/gettext-tools/src/x-rst.c +++ b/gettext-tools/src/x-rst.c @@ -31,7 +31,7 @@ #include "x-rst.h" #include "error.h" #include "error-progname.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "gettext.h" diff --git a/gettext-tools/src/x-sh.c b/gettext-tools/src/x-sh.c index 129f53214..7e4eda0ac 100644 --- a/gettext-tools/src/x-sh.c +++ b/gettext-tools/src/x-sh.c @@ -31,7 +31,7 @@ #include "xgettext.h" #include "x-sh.h" #include "error.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "hash.h" #include "gettext.h" diff --git a/gettext-tools/src/x-smalltalk.c b/gettext-tools/src/x-smalltalk.c index 12aa259c9..15a8e6513 100644 --- a/gettext-tools/src/x-smalltalk.c +++ b/gettext-tools/src/x-smalltalk.c @@ -29,7 +29,7 @@ #include "xgettext.h" #include "x-smalltalk.h" #include "error.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "gettext.h" diff --git a/gettext-tools/src/x-tcl.c b/gettext-tools/src/x-tcl.c index 549b3d133..bfad46077 100644 --- a/gettext-tools/src/x-tcl.c +++ b/gettext-tools/src/x-tcl.c @@ -33,7 +33,7 @@ #include "xgettext.h" #include "x-tcl.h" #include "error.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "hash.h" #include "c-ctype.h" diff --git a/gettext-tools/src/x-ycp.c b/gettext-tools/src/x-ycp.c index 9116b4f89..80a8cfd83 100644 --- a/gettext-tools/src/x-ycp.c +++ b/gettext-tools/src/x-ycp.c @@ -32,7 +32,7 @@ #include "xgettext.h" #include "x-ycp.h" #include "error.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "gettext.h" diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c index 4174ebb6c..358449fd3 100644 --- a/gettext-tools/src/xgettext.c +++ b/gettext-tools/src/xgettext.c @@ -43,7 +43,7 @@ #include "relocatable.h" #include "basename.h" #include "xerror.h" -#include "xmalloc.h" +#include "xalloc.h" #include "strstr.h" #include "xerror.h" #include "exit.h" diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 8e1f52a1a..444a9f741 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,7 @@ +2003-10-09 Bruno Haible + + * tstgettext.c: Include xalloc.h instead of xmalloc.h. + 2003-10-05 Bruno Haible * xgettext-4: Update expected test result. diff --git a/gettext-tools/tests/tstgettext.c b/gettext-tools/tests/tstgettext.c index fefe6fd31..3234295fb 100644 --- a/gettext-tools/tests/tstgettext.c +++ b/gettext-tools/tests/tstgettext.c @@ -32,7 +32,7 @@ #include "progname.h" #include "relocatable.h" #include "basename.h" -#include "xmalloc.h" +#include "xalloc.h" #include "exit.h" #include "xsetenv.h"