Remove unused msgstr_pos argument.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 0bb8da14d7a760ae2af2321811ed562c6d69828a..630cdd964334e891ae358a1466250c6536fe7dc1 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-04  Bruno Haible  <bruno@clisp.org>
+
+       * msgl-check.h (check_message): Remove msgstr_pos argument.
+       * msgl-check.c (check_pair, check_message): Remove msgstr_pos argument.
+       * msgfmt.c (msgfmt_frob_new_message): Update.
+       * gettext-po.c (po_file_check_all, po_message_check_all,
+       po_message_check_format): Update.
+
 2005-10-03  Bruno Haible  <bruno@clisp.org>
 
        Add support for contexts in xgettext.

diff --git a/gettext-tools/src/gettext-po.c b/gettext-tools/src/gettext-po.c
index 7a15c52fea7a6dcebf67f4aa631b9d6f4ea3f5e9..76a3773217216af49b23a84b7db8b1d4e9356695 100644 (file)
--- a/gettext-tools/src/gettext-po.c
+++ b/gettext-tools/src/gettext-po.c
@@ -1038,7 +1038,7 @@ po_file_check_all (po_file_t file, po_xerror_handler_t handler)
        {
          message_ty *mp = mlp->item[j];
 
-         check_message (mp, &mp->pos, &mp->pos, 1, 1, 1, 0, 0, 0);
+         check_message (mp, &mp->pos, 1, 1, 1, 0, 0, 0);
        }
 
       check_plural (mlp);
@@ -1068,7 +1068,7 @@ po_message_check_all (po_message_t message, po_message_iterator_t iterator,
     (void (*) (int, const message_ty *, const char *, size_t, size_t, int, const char *, const message_ty *, const char *, size_t, size_t, int, const char *))
     handler->xerror2;
 
-  check_message (mp, &mp->pos, &mp->pos, 1, 1, 1, 0, 0, 0);
+  check_message (mp, &mp->pos, 1, 1, 1, 0, 0, 0);
 
   /* For plural checking, combine the message and its header into a small,
      two-element message list.  */
@@ -1131,7 +1131,7 @@ po_message_check_format (po_message_t message, po_xerror_handler_t handler)
     (void (*) (int, const message_ty *, const char *, size_t, size_t, int, const char *, const message_ty *, const char *, size_t, size_t, int, const char *))
     handler->xerror2;
 
-  check_message (mp, &mp->pos, &mp->pos, 0, 1, 0, 0, 0, 0);
+  check_message (mp, &mp->pos, 0, 1, 0, 0, 0, 0);
 
   /* Restore error handler.  */
   po_xerror  = textmode_xerror;

diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index 7107b4a6060be4c4fd48f4e09904b2405807fe4e..ef223a78fe12085140960c82095888f7de2d8be3 100644 (file)
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -988,7 +988,7 @@ msgfmt_frob_new_message (default_po_reader_ty *that, message_ty *mp,
            else
              ++msgs_translated;
 
-         if (check_message (mp, msgid_pos, msgstr_pos,
+         if (check_message (mp, msgid_pos,
                             1, check_format_strings, check_header,
                             check_compatibility,
                             check_accelerators, accelerator_char))

diff --git a/gettext-tools/src/msgl-check.c b/gettext-tools/src/msgl-check.c
index f741825a7b2ef8e34f021aa93fae98be79bfe287..a424c09d0cb947f140960a198cb79fe613d79239 100644 (file)
--- a/gettext-tools/src/msgl-check.c
+++ b/gettext-tools/src/msgl-check.c
@@ -479,7 +479,6 @@ check_pair (const message_ty *mp,
            const lex_pos_ty *msgid_pos,
            const char *msgid_plural,
            const char *msgstr, size_t msgstr_len,
-           const lex_pos_ty *msgstr_pos,
            const enum is_format is_format[NFORMATS],
            int check_newlines,
            int check_format_strings,
@@ -721,7 +720,7 @@ some header fields still have the initial default value\n"));
    Return nonzero if an error was seen.  */
 int
 check_message (const message_ty *mp,
-              const lex_pos_ty *msgid_pos, const lex_pos_ty *msgstr_pos,
+              const lex_pos_ty *msgid_pos,
               int check_newlines,
               int check_format_strings,
               int check_header,
@@ -733,7 +732,7 @@ check_message (const message_ty *mp,
 
   return check_pair (mp,
                     mp->msgid, msgid_pos, mp->msgid_plural,
-                    mp->msgstr, mp->msgstr_len, msgstr_pos,
+                    mp->msgstr, mp->msgstr_len,
                     mp->is_format,
                     check_newlines, check_format_strings, check_compatibility,
                     check_accelerators, accelerator_char);

diff --git a/gettext-tools/src/msgl-check.h b/gettext-tools/src/msgl-check.h
index 4fabcdabab9ad0cd161fb36c197c4177beacafd2..e32f0d612c6ed422c327061653c1deaf3d24ca6d 100644 (file)
--- a/gettext-tools/src/msgl-check.h
+++ b/gettext-tools/src/msgl-check.h
@@ -36,7 +36,6 @@ extern int check_plural (message_list_ty *mlp);
    Return nonzero if an error was seen.  */
 extern int check_message (const message_ty *mp,
                          const lex_pos_ty *msgid_pos,
-                         const lex_pos_ty *msgstr_pos,
                          int check_newlines,
                          int check_format_strings,
                          int check_header,