Make 64-bit clean.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 8cc75a1b52fca566815275217143b09a94a640d3..05e1eee23d7879e31d91b3a21d45950936f5c83b 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-19  Bruno Haible  <bruno@clisp.org>
+
+       * xgettext.c (arglist_parser_done): Use error_at_line instead of error.
+
 2006-03-16  Bruno Haible  <bruno@clisp.org>
 
        * msggrep.c (grep_task): Increment size.

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 66359027bcb51cc0afdfb3a2d46549edae480728..f936d9a59c75677ed29b4d48d5e49c8a15c80760 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -2575,10 +2575,11 @@ arglist_parser_done (struct arglist_parser *ap, int argnum)
       if (ambiguous)
        {
          error_with_progname = false;
-         error (0, 0,
-                _("%s:%d: ambiguous argument specification for keyword '%.*s'"),
-                best_cp->msgid_pos.file_name, best_cp->msgid_pos.line_number,
-                ap->keyword_len, ap->keyword);
+         error_at_line (0, 0,
+                        best_cp->msgid_pos.file_name,
+                        best_cp->msgid_pos.line_number,
+                        _("ambiguous argument specification for keyword '%.*s'"),
+                        ap->keyword_len, ap->keyword);
          error_with_progname = true;
        }
 
@@ -2601,10 +2602,11 @@ arglist_parser_done (struct arglist_parser *ap, int argnum)
              if (separator == NULL)
                {
                  error_with_progname = false;
-                 error (0, 0,
-                        _("%s:%d: warning: missing context for keyword '%.*s'"),
-                        best_cp->msgid_pos.file_name, best_cp->msgid_pos.line_number,
-                        ap->keyword_len, ap->keyword);
+                 error_at_line (0, 0,
+                                best_cp->msgid_pos.file_name,
+                                best_cp->msgid_pos.line_number,
+                                _("warning: missing context for keyword '%.*s'"),
+                                ap->keyword_len, ap->keyword);
                  error_with_progname = true;
                }
              else
@@ -2625,11 +2627,11 @@ arglist_parser_done (struct arglist_parser *ap, int argnum)
              if (separator == NULL)
                {
                  error_with_progname = false;
-                 error (0, 0,
-                        _("%s:%d: warning: missing context for plural argument of keyword '%.*s'"),
-                        best_cp->msgid_plural_pos.file_name,
-                        best_cp->msgid_plural_pos.line_number,
-                        ap->keyword_len, ap->keyword);
+                 error_at_line (0, 0,
+                                best_cp->msgid_plural_pos.file_name,
+                                best_cp->msgid_plural_pos.line_number,
+                                _("warning: missing context for plural argument of keyword '%.*s'"),
+                                ap->keyword_len, ap->keyword);
                  error_with_progname = true;
                }
              else
@@ -2646,10 +2648,10 @@ arglist_parser_done (struct arglist_parser *ap, int argnum)
                      if (strcmp (ctxt, best_cp->msgctxt) != 0)
                        {
                          error_with_progname = false;
-                         error (0, 0,
-                                _("%s:%d: context mismatch between singular and plural form"),
-                                best_cp->msgid_plural_pos.file_name,
-                                best_cp->msgid_plural_pos.line_number);
+                         error_at_line (0, 0,
+                                        best_cp->msgid_plural_pos.file_name,
+                                        best_cp->msgid_plural_pos.line_number,
+                                        _("%s:%d: context mismatch between singular and plural form"));
                          error_with_progname = true;
                        }
                      free (ctxt);