Move the xasprintf function from the 'xerror' module to the 'xvasprintf'

module.

32 files changed, 76 insertions, 33 deletions

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index ba4d412..8db1b54 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,5 +1,39 @@
 2006-04-30  Bruno Haible  <bruno@clisp.org>
 
+	* msgfmt.c: Include xvasprintf.h.
+	* msginit.c: Likewise.
+	* msgl-cat.c: Likewise.
+	* msgl-charset.c: Likewise.
+	* po-xerror.c: Likewise.
+	* x-csharp.c: Likewise.
+	* x-glade.c: Likewise.
+	* x-python.c: Likewise.
+	* xgettext.c: Likewise.
+	* format-boost.c: Include xvasprintf.h instead of xerror.h.
+	* format-c.c: Likewise.
+	* format-csharp.c: Likewise.
+	* format-gcc-internal.c: Likewise.
+	* format-java.c: Likewise.
+	* format-lisp.c: Likewise.
+	* format-perl.c: Likewise.
+	* format-python.c: Likewise.
+	* format-qt.c: Likewise.
+	* format-scheme.c: Likewise.
+	* format-ycp.c: Likewise.
+	* msgexec.c: Likewise.
+	* msgl-check.c: Likewise.
+	* msgl-iconv.c: Likewise.
+	* open-po.c: Likewise.
+	* po-charset.c: Likewise.
+	* po-lex.c: Likewise.
+	* po-time.c: Likewise.
+	* read-po-abstract.c: Likewise.
+	* read-properties.c: Likewise.
+	* read-stringtable.c: Likewise.
+	* write-po.c: Likewise.
+
+2006-04-30  Bruno Haible  <bruno@clisp.org>
+
 	* msginit.c (project_id, project_id_version, get_user_email): Close
 	the FILE in case of I/O error.
 
diff --git a/gettext-tools/src/format-boost.c b/gettext-tools/src/format-boost.c
index ccf4f61..70f9d5e 100644
--- a/gettext-tools/src/format-boost.c
+++ b/gettext-tools/src/format-boost.c
@@ -26,7 +26,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/format-c.c b/gettext-tools/src/format-c.c
index e31bebf..31d27bc 100644
--- a/gettext-tools/src/format-c.c
+++ b/gettext-tools/src/format-c.c
@@ -26,7 +26,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/format-csharp.c b/gettext-tools/src/format-csharp.c
index 966ede2..2fd7593 100644
--- a/gettext-tools/src/format-csharp.c
+++ b/gettext-tools/src/format-csharp.c
@@ -26,7 +26,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-gcc-internal.c b/gettext-tools/src/format-gcc-internal.c
index 43713ae..c3842f1 100644
--- a/gettext-tools/src/format-gcc-internal.c
+++ b/gettext-tools/src/format-gcc-internal.c
@@ -26,7 +26,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/format-java.c b/gettext-tools/src/format-java.c
index b7f6de1..936297d 100644
--- a/gettext-tools/src/format-java.c
+++ b/gettext-tools/src/format-java.c
@@ -29,7 +29,7 @@
 #include "c-ctype.h"
 #include "xalloc.h"
 #include "xallocsa.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/format-lisp.c b/gettext-tools/src/format-lisp.c
index 4b746b2..c431439 100644
--- a/gettext-tools/src/format-lisp.c
+++ b/gettext-tools/src/format-lisp.c
@@ -27,7 +27,7 @@
 #include "c-ctype.h"
 #include "gcd.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "minmax.h"
 #include "gettext.h"
diff --git a/gettext-tools/src/format-perl.c b/gettext-tools/src/format-perl.c
index 20d6632..7539810 100644
--- a/gettext-tools/src/format-perl.c
+++ b/gettext-tools/src/format-perl.c
@@ -26,7 +26,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/format-python.c b/gettext-tools/src/format-python.c
index b86de59..35012e3 100644
--- a/gettext-tools/src/format-python.c
+++ b/gettext-tools/src/format-python.c
@@ -27,7 +27,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/format-qt.c b/gettext-tools/src/format-qt.c
index f4da230..aa51a93 100644
--- a/gettext-tools/src/format-qt.c
+++ b/gettext-tools/src/format-qt.c
@@ -25,7 +25,7 @@
 
 #include "format.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-scheme.c b/gettext-tools/src/format-scheme.c
index 7497a92..5005b02 100644
--- a/gettext-tools/src/format-scheme.c
+++ b/gettext-tools/src/format-scheme.c
@@ -27,7 +27,7 @@
 #include "c-ctype.h"
 #include "gcd.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "minmax.h"
 #include "error.h"
diff --git a/gettext-tools/src/format-ycp.c b/gettext-tools/src/format-ycp.c
index cf9797d..8acbf6b 100644
--- a/gettext-tools/src/format-ycp.c
+++ b/gettext-tools/src/format-ycp.c
@@ -26,7 +26,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c
index 1e044b9..6074616 100644
--- a/gettext-tools/src/msgexec.c
+++ b/gettext-tools/src/msgexec.c
@@ -34,7 +34,7 @@
 #include "closeout.h"
 #include "dir-list.h"
 #include "error.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index 7871687..a181f71 100644
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -36,6 +36,7 @@
 #include "relocatable.h"
 #include "basename.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "xalloc.h"
 #include "stpcpy.h"
 #include "exit.h"
diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index 73d49d5..97b15e3 100644
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -89,6 +89,7 @@
 #include "exit.h"
 #include "pathname.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "msgl-english.h"
 #include "plural-count.h"
 #include "pipe.h"
diff --git a/gettext-tools/src/msgl-cat.c b/gettext-tools/src/msgl-cat.c
index d46dff5..3ae79b8 100644
--- a/gettext-tools/src/msgl-cat.c
+++ b/gettext-tools/src/msgl-cat.c
@@ -1,5 +1,5 @@
 /* Message list concatenation and duplicate handling.
-   Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,7 @@
 
 #include "error.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "message.h"
 #include "read-po.h"
 #include "po-charset.h"
diff --git a/gettext-tools/src/msgl-charset.c b/gettext-tools/src/msgl-charset.c
index db65795..53592b6 100644
--- a/gettext-tools/src/msgl-charset.c
+++ b/gettext-tools/src/msgl-charset.c
@@ -1,5 +1,5 @@
 /* Message list charset and locale charset handling.
-   Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -35,6 +35,7 @@
 #include "basename.h"
 #include "xallocsa.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "message.h"
 #include "strstr.h"
 #include "exit.h"
diff --git a/gettext-tools/src/msgl-check.c b/gettext-tools/src/msgl-check.c
index 9d010f3..8d3e484 100644
--- a/gettext-tools/src/msgl-check.c
+++ b/gettext-tools/src/msgl-check.c
@@ -1,5 +1,5 @@
 /* Checking of messages in PO files.
-   Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "format.h"
 #include "plural-exp.h"
diff --git a/gettext-tools/src/msgl-iconv.c b/gettext-tools/src/msgl-iconv.c
index 163cdf1..c171fa4 100644
--- a/gettext-tools/src/msgl-iconv.c
+++ b/gettext-tools/src/msgl-iconv.c
@@ -42,7 +42,7 @@
 #include "xalloc.h"
 #include "xallocsa.h"
 #include "strstr.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/open-po.c b/gettext-tools/src/open-po.c
index 079954b..d92569f 100644
--- a/gettext-tools/src/open-po.c
+++ b/gettext-tools/src/open-po.c
@@ -1,5 +1,5 @@
 /* open-po - search for .po file along search path list and open for reading
-   Copyright (C) 1995-1996, 2000-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2000-2003, 2005-2006 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 #include "dir-list.h"
 #include "pathname.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/po-charset.c b/gettext-tools/src/po-charset.c
index 23d29f0..46d7bc5 100644
--- a/gettext-tools/src/po-charset.c
+++ b/gettext-tools/src/po-charset.c
@@ -29,7 +29,7 @@
 #include <string.h>
 
 #include "xallocsa.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "basename.h"
 #include "progname.h"
diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c
index a4c2693..c577864 100644
--- a/gettext-tools/src/po-lex.c
+++ b/gettext-tools/src/po-lex.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2006 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>.
    Multibyte character handling by Bruno Haible <haible@clisp.cons.org>.
@@ -46,7 +46,7 @@
 #include "exit.h"
 #include "error.h"
 #include "error-progname.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-error.h"
 #include "po-xerror.h"
 #include "pos.h"
diff --git a/gettext-tools/src/po-time.c b/gettext-tools/src/po-time.c
index 48622d4..6e37434 100644
--- a/gettext-tools/src/po-time.c
+++ b/gettext-tools/src/po-time.c
@@ -1,5 +1,5 @@
 /* PO/POT file timestamps.
-   Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003, 2006 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
 /* Specification.  */
 #include "po-time.h"
 
-#include "xerror.h"
+#include "xvasprintf.h"
 
 
 #define TM_YEAR_ORIGIN 1900
diff --git a/gettext-tools/src/po-xerror.c b/gettext-tools/src/po-xerror.c
index 0e5de27..869b1c7 100644
--- a/gettext-tools/src/po-xerror.c
+++ b/gettext-tools/src/po-xerror.c
@@ -1,5 +1,5 @@
 /* Error handling during reading and writing of PO files.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,7 @@
 #include "error-progname.h"
 #include "xalloc.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "po-error.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/read-po-abstract.c b/gettext-tools/src/read-po-abstract.c
index fa8fe37..b3c2790 100644
--- a/gettext-tools/src/read-po-abstract.c
+++ b/gettext-tools/src/read-po-abstract.c
@@ -1,5 +1,5 @@
 /* Reading PO files, abstract class.
-   Copyright (C) 1995-1996, 1998, 2000-2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 1998, 2000-2006 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -32,7 +32,7 @@
 #include "read-properties.h"
 #include "read-stringtable.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/read-properties.c b/gettext-tools/src/read-properties.c
index 9b853a8..c08839c 100644
--- a/gettext-tools/src/read-properties.c
+++ b/gettext-tools/src/read-properties.c
@@ -1,5 +1,5 @@
 /* Reading Java .properties files.
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -35,7 +35,7 @@
 #include "message.h"
 #include "read-po-abstract.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "msgl-ascii.h"
 #include "utf16-ucs4.h"
diff --git a/gettext-tools/src/read-stringtable.c b/gettext-tools/src/read-stringtable.c
index 59f78e4..1565ed3 100644
--- a/gettext-tools/src/read-stringtable.c
+++ b/gettext-tools/src/read-stringtable.c
@@ -1,5 +1,5 @@
 /* Reading NeXTstep/GNUstep .strings files.
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,7 @@
 #include "error-progname.h"
 #include "read-po-abstract.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "utf8-ucs4.h"
 #include "ucs4-utf8.h"
diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c
index 89adbf8..2ace2b2 100644
--- a/gettext-tools/src/write-po.c
+++ b/gettext-tools/src/write-po.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -46,7 +46,7 @@
 #include "strstr.h"
 #include "fwriteerror.h"
 #include "error-progname.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c
index 4d87cb9..d774d6d 100644
--- a/gettext-tools/src/x-csharp.c
+++ b/gettext-tools/src/x-csharp.c
@@ -34,6 +34,7 @@
 #include "error-progname.h"
 #include "xalloc.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "exit.h"
 #include "hash.h"
 #include "po-charset.h"
diff --git a/gettext-tools/src/x-glade.c b/gettext-tools/src/x-glade.c
index b15c705..bc76421 100644
--- a/gettext-tools/src/x-glade.c
+++ b/gettext-tools/src/x-glade.c
@@ -39,6 +39,7 @@
 #include "x-glade.h"
 #include "error.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "basename.h"
 #include "progname.h"
 #include "xalloc.h"
diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index 87b49db..7a3d4b1 100644
--- a/gettext-tools/src/x-python.c
+++ b/gettext-tools/src/x-python.c
@@ -36,6 +36,7 @@
 #include "progname.h"
 #include "basename.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "xalloc.h"
 #include "exit.h"
 #include "strstr.h"
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index ba02659..f03166a 100644
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -43,6 +43,7 @@
 #include "relocatable.h"
 #include "basename.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "xalloc.h"
 #include "xallocsa.h"
 #include "strstr.h"