From: Bruno Haible <bruno@clisp.org>
Date: Fri, 2 Aug 2024 02:17:50 +0000 (+0200)
Subject: Refactor includes.
X-Git-Tag: v0.23~196
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26d059911468a1d737a5d4109c3759aeff262a88;p=thirdparty%2Fgettext.git

Refactor includes.

* gettext-tools/src/read-catalog-abstract.h: Include <stdio.h>. Don't include
po-lex.h.
* gettext-tools/src/read-catalog.c: Include po-lex.h.
* gettext-tools/src/msgcmp.c: Include po-lex.h.
* gettext-tools/src/msgfmt.c: Likewise.
* gettext-tools/src/msgmerge.c: Likewise.
* gettext-tools/src/xgettext.c: Likewise.
* gettext-tools/libgettextpo/gettext-po.c: Likewise.
* gettext-tools/src/x-po.c: Include <error.h>. Don't include po-lex.h.
* gettext-tools/src/read-desktop.h: Include pos.h. Don't include po-lex.h.
* gettext-tools/src/read-desktop.c: Don't include po-lex.h.
---

diff --git a/gettext-tools/libgettextpo/gettext-po.c b/gettext-tools/libgettextpo/gettext-po.c
index ffcb11d15..397088006 100644
--- a/gettext-tools/libgettextpo/gettext-po.c
+++ b/gettext-tools/libgettextpo/gettext-po.c
@@ -48,6 +48,7 @@ static void (*orig_error_at_line) (int status, int errnum,
 #include "xalloc.h"
 #include "read-catalog.h"
 #include "read-po.h"
+#include "po-lex.h"
 #include "write-catalog.h"
 #include "write-po.h"
 #include "xerror.h"
diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c
index e9bf6fc8b..ac5660894 100644
--- a/gettext-tools/src/msgcmp.c
+++ b/gettext-tools/src/msgcmp.c
@@ -37,6 +37,7 @@
 #include "message.h"
 #include "read-catalog-file.h"
 #include "read-po.h"
+#include "po-lex.h"
 #include "read-properties.h"
 #include "read-stringtable.h"
 #include "xmalloca.h"
diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index 87eab26c0..a6ab145fc 100644
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -56,6 +56,7 @@
 #include "open-catalog.h"
 #include "read-catalog-file.h"
 #include "read-po.h"
+#include "po-lex.h"
 #include "read-properties.h"
 #include "read-stringtable.h"
 #include "read-desktop.h"
diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 4980b2d82..6349a7a32 100644
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -44,6 +44,7 @@
 #include "message.h"
 #include "read-catalog-file.h"
 #include "read-po.h"
+#include "po-lex.h"
 #include "read-properties.h"
 #include "read-stringtable.h"
 #include "write-catalog.h"
diff --git a/gettext-tools/src/read-catalog-abstract.h b/gettext-tools/src/read-catalog-abstract.h
index 2381f106a..197bbe666 100644
--- a/gettext-tools/src/read-catalog-abstract.h
+++ b/gettext-tools/src/read-catalog-abstract.h
@@ -19,10 +19,10 @@
 #ifndef _READ_CATALOG_ABSTRACT_H
 #define _READ_CATALOG_ABSTRACT_H
 
-#include "po-lex.h"
-#include "message.h"
-
 #include <stdbool.h>
+#include <stdio.h>
+
+#include "message.h"
 
 
 #ifdef __cplusplus
diff --git a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c
index 0f8d065f3..263f83544 100644
--- a/gettext-tools/src/read-catalog.c
+++ b/gettext-tools/src/read-catalog.c
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "po-charset.h"
+#include "po-lex.h"
 #include "po-xerror.h"
 #include "xalloc.h"
 #include "read-catalog-special.h"
diff --git a/gettext-tools/src/read-desktop.c b/gettext-tools/src/read-desktop.c
index 53978c3ff..a12c4bf2e 100644
--- a/gettext-tools/src/read-desktop.c
+++ b/gettext-tools/src/read-desktop.c
@@ -36,7 +36,6 @@
 #include "xalloc.h"
 #include "xvasprintf.h"
 #include "c-ctype.h"
-#include "po-lex.h"
 #include "po-xerror.h"
 #include "gettext.h"
 
diff --git a/gettext-tools/src/read-desktop.h b/gettext-tools/src/read-desktop.h
index 6bda42bb0..8fc14db91 100644
--- a/gettext-tools/src/read-desktop.h
+++ b/gettext-tools/src/read-desktop.h
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include "mem-hash-map.h"
-#include "po-lex.h"
+#include "pos.h"
 #include "str-list.h"
 
 #ifdef __cplusplus
@@ -93,9 +93,9 @@ extern void desktop_reader_handle_group (desktop_reader_ty *reader,
 
 extern void desktop_reader_handle_pair (desktop_reader_ty *reader,
                                         lex_pos_ty *key_pos,
-                                 const char *key,
-                                 const char *locale,
-                                 const char *value);
+                                        const char *key,
+                                        const char *locale,
+                                        const char *value);
 
 extern void desktop_reader_handle_comment (desktop_reader_ty *reader,
                                            const char *s);
diff --git a/gettext-tools/src/x-po.c b/gettext-tools/src/x-po.c
index 89074da74..c6140d030 100644
--- a/gettext-tools/src/x-po.c
+++ b/gettext-tools/src/x-po.c
@@ -30,6 +30,7 @@
 #include <stdbool.h>
 #include <string.h>
 
+#include <error.h>
 #include "message.h"
 #include "xgettext.h"
 #include "xalloc.h"
@@ -40,7 +41,6 @@
 #include "msgl-iconv.h"
 #include "msgl-ascii.h"
 #include "po-charset.h"
-#include "po-lex.h"
 #include "gettext.h"
 
 /* A convenience macro.  I don't like writing gettext() every time.  */
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index c470b334b..0c28dcd6d 100644
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -69,6 +69,7 @@
 #include "open-catalog.h"
 #include "read-catalog-abstract.h"
 #include "read-po.h"
+#include "po-lex.h"
 #include "message.h"
 #include "pos.h"
 #include "po-charset.h"