From 5bbaece7f92c5df5110aeaf7a3cf17ac4abcf9cb Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Mon, 20 Mar 2006 13:11:13 +0000
Subject: Make 64-bit clean.
---
gettext-tools/src/ChangeLog | 4 ++++
gettext-tools/src/xgettext.c | 36 +++++++++++++++++++-----------------
2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 8cc75a1..05e1eee 100644
--- 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 6635902..f936d9a 100644
--- 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);
--
cgit v1.1