From: Bruno Haible <bruno@clisp.org>
Date: Thu, 13 Oct 2005 11:02:32 +0000 (+0000)
Subject: Remove unused msgstr_pos argument.
X-Git-Tag: v0.15~367
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d08cfe71c9d0101490bb31f47ca5857df57ffefd;p=thirdparty%2Fgettext.git

Remove unused msgstr_pos argument.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 0bb8da14d..630cdd964 100644
--- 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 7a15c52fe..76a377321 100644
--- 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 7107b4a60..ef223a78f 100644
--- 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 f741825a7..a424c09d0 100644
--- 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 4fabcdaba..e32f0d612 100644
--- 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,