Change the calling convention of the formatstring_parser's 'check' method.

Add format string checking facility to the gettextpo library.

1 files changed, 8 insertions, 14 deletions

diff --git a/gettext-tools/src/format-qt.c b/gettext-tools/src/format-qt.c
index 6cd174f..d8116f5 100644
--- a/gettext-tools/src/format-qt.c
+++ b/gettext-tools/src/format-qt.c
@@ -26,8 +26,6 @@
 #include "format.h"
 #include "xalloc.h"
 #include "xerror.h"
-#include "error.h"
-#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -110,8 +108,9 @@ format_get_number_of_directives (void *descr)
 }
 
 static bool
-format_check (const lex_pos_ty *pos, void *msgid_descr, void *msgstr_descr,
-	      bool equality, bool noisy, const char *pretty_msgstr)
+format_check (void *msgid_descr, void *msgstr_descr, bool equality,
+	      formatstring_error_logger_t error_logger,
+	      const char *pretty_msgstr)
 {
   struct spec *spec1 = (struct spec *) msgid_descr;
   struct spec *spec2 = (struct spec *) msgstr_descr;
@@ -127,16 +126,11 @@ format_check (const lex_pos_ty *pos, void *msgid_descr, void *msgstr_descr,
 	 yield a "Argument missing" warning at runtime.  */
       if (arg_used1 != arg_used2)
 	{
-	  if (noisy)
-	    {
-	      error_with_progname = false;
-	      error_at_line (0, 0, pos->file_name, pos->line_number,
-			     arg_used1
-			     ? _("a format specification for argument %u doesn't exist in '%s'")
-			     : _("a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"),
-			     i, pretty_msgstr);
-	      error_with_progname = true;
-	    }
+	  if (error_logger)
+	    error_logger (arg_used1
+			  ? _("a format specification for argument %u doesn't exist in '%s'")
+			  : _("a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"),
+			  i, pretty_msgstr);
 	  err = true;
 	  break;
 	}