From: Bruno Haible <bruno@clisp.org>
Date: Mon, 30 Sep 2024 16:16:22 +0000 (+0200)
Subject: its: Simplify.
X-Git-Tag: v0.23~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a62666bf416c848b189288bebb7994dbbb513fcd;p=thirdparty%2Fgettext.git

its: Simplify.

* gettext-tools/src/its.h: Don't include xg-arglist-context.h.
(its_rule_list_extract): Remove flag_table parameter.
* gettext-tools/src/its.c (its_rule_list_extract_text, its_rule_list_extract):
Remove flag_table parameter.
* gettext-tools/src/xgettext.c (extract_from_xml_file): Update.
---

diff --git a/gettext-tools/src/its.c b/gettext-tools/src/its.c
index f82a47889..32ab432f3 100644
--- a/gettext-tools/src/its.c
+++ b/gettext-tools/src/its.c
@@ -1722,7 +1722,6 @@ static void
 its_rule_list_extract_text (its_rule_list_ty *rules,
                             xmlNode *node,
                             const char *logical_filename,
-                            flag_context_list_table_ty *flag_table,
                             message_list_ty *mlp,
                             its_extract_callback_ty callback)
 {
@@ -1857,7 +1856,6 @@ void
 its_rule_list_extract (its_rule_list_ty *rules,
                        FILE *fp, const char *real_filename,
                        const char *logical_filename,
-                       flag_context_list_table_ty *flag_table,
                        msgdomain_list_ty *mdlp,
                        its_extract_callback_ty callback)
 {
@@ -1887,7 +1885,6 @@ its_rule_list_extract (its_rule_list_ty *rules,
   for (i = 0; i < nodes.nitems; i++)
     its_rule_list_extract_text (rules, nodes.items[i],
                                 logical_filename,
-                                flag_table,
                                 mdlp->item[0]->messages,
                                 callback);
 
diff --git a/gettext-tools/src/its.h b/gettext-tools/src/its.h
index 49af5cec5..234952798 100644
--- a/gettext-tools/src/its.h
+++ b/gettext-tools/src/its.h
@@ -1,5 +1,5 @@
 /* Internationalization Tag Set (ITS) handling
-   Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+   Copyright (C) 2015-2024 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2015.
 
@@ -23,7 +23,6 @@
 
 #include "message.h"
 #include "pos.h"
-#include "xg-arglist-context.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -66,7 +65,6 @@ extern bool its_rule_list_add_from_file (its_rule_list_ty *rules,
 extern void its_rule_list_extract (its_rule_list_ty *rules,
                                    FILE *fp, const char *real_filename,
                                    const char *logical_filename,
-                                   flag_context_list_table_ty *flag_table,
                                    msgdomain_list_ty *mdlp,
                                    its_extract_callback_ty callback);
 
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 178a9023d..b372890ee 100644
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -2033,7 +2033,6 @@ extract_from_xml_file (const char *file_name,
 #endif
 
   its_rule_list_extract (rules, fp, real_file_name, logical_file_name,
-                         NULL,
                          mdlp,
                          xgettext_its_extract_callback);