aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog9
-rw-r--r--gcc/java/gjavah.c13
-rw-r--r--gcc/java/java-tree.h2
-rw-r--r--gcc/java/jv-scan.c28
-rw-r--r--gcc/java/parse.y26
5 files changed, 46 insertions, 32 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 117cea9..aaca59d 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-06 Jakub Jelinek <jakub@redhat.com>
+
+ * jv-scan.c (fatal_error, warning, warning0): Use gmsgid instead of
+ msgid for argument name.
+ * gjavah.c (error): Likewise.
+ * java-tree.h (parse_error_context): Likewise.
+ * parse.y (parse_error_context, parse_warning_context,
+ issue_warning_error_from_context): Likewise.
+
2005-06-01 Tom Tromey <tromey@redhat.com>
PR java/21722:
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index d25dab8..5b36dae 100644
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -164,7 +164,7 @@ static const unsigned char *
decode_signature_piece (FILE *, const unsigned char *,
const unsigned char *, int *);
static void print_class_decls (FILE *, JCF *, int);
-static void error (const char *msgid, ...);
+static void error (const char *gmsgid, ...);
static void usage (void) ATTRIBUTE_NORETURN;
static void help (void) ATTRIBUTE_NORETURN;
static void version (void) ATTRIBUTE_NORETURN;
@@ -266,16 +266,19 @@ static int decompiled = 0;
#include "jcf-reader.c"
-/* Print an error message and set found_error. */
+/* Print an error message and set found_error.
+ Not really gcc-internal-format message, but as error elsewhere
+ uses it, assume all users will use intersection between
+ c-format and gcc-internal-format. */
static void
-error (const char *msgid, ...)
+error (const char *gmsgid, ...)
{
va_list ap;
- va_start (ap, msgid);
+ va_start (ap, gmsgid);
fprintf (stderr, TOOLNAME ": ");
- vfprintf (stderr, _(msgid), ap);
+ vfprintf (stderr, _(gmsgid), ap);
va_end (ap);
fprintf (stderr, "\n");
found_error = 1;
diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h
index 3799563..53e9cfd 100644
--- a/gcc/java/java-tree.h
+++ b/gcc/java/java-tree.h
@@ -1305,7 +1305,7 @@ extern tree emit_symbol_table (tree, tree, tree, tree, tree, int);
extern void lang_init_source (int);
extern void write_classfile (tree);
extern char *print_int_node (tree);
-extern void parse_error_context (tree cl, const char *msgid, ...);
+extern void parse_error_context (tree cl, const char *gmsgid, ...);
extern void finish_class (void);
extern void java_layout_seen_class_methods (void);
extern void check_for_initialization (tree, tree);
diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c
index a283328..0f09e91 100644
--- a/gcc/java/jv-scan.c
+++ b/gcc/java/jv-scan.c
@@ -40,10 +40,10 @@ Boston, MA 02111-1307, USA. */
#include <getopt.h>
-extern void fatal_error (const char *msgid, ...)
+extern void fatal_error (const char *gmsgid, ...)
ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
-void warning (int opt, const char *msgid, ...) ATTRIBUTE_PRINTF_2;
-void warning0 (const char *msgid, ...) ATTRIBUTE_PRINTF_1;
+void warning (int opt, const char *gmsgid, ...) ATTRIBUTE_PRINTF_2;
+void warning0 (const char *gmsgid, ...) ATTRIBUTE_PRINTF_1;
void report (void);
static void usage (void) ATTRIBUTE_NORETURN;
@@ -245,38 +245,40 @@ main (int argc, char **argv)
/* Error report, memory, obstack initialization and other utility
- functions */
+ functions. Use actually c-format msgid, but as functions with
+ the same name elsewhere use gcc-internal-format, assume all users
+ here use intersection between c-format and gcc-internal-format. */
void
-fatal_error (const char *msgid, ...)
+fatal_error (const char *gmsgid, ...)
{
va_list ap;
- va_start (ap, msgid);
+ va_start (ap, gmsgid);
fprintf (stderr, _("%s: error: "), exec_name);
- vfprintf (stderr, _(msgid), ap);
+ vfprintf (stderr, _(gmsgid), ap);
fputc ('\n', stderr);
va_end (ap);
exit (1);
}
void
-warning (int opt ATTRIBUTE_UNUSED, const char *msgid, ...)
+warning (int opt ATTRIBUTE_UNUSED, const char *gmsgid, ...)
{
va_list ap;
- va_start (ap, msgid);
+ va_start (ap, gmsgid);
fprintf (stderr, _("%s: warning: "), exec_name);
- vfprintf (stderr, _(msgid), ap);
+ vfprintf (stderr, _(gmsgid), ap);
fputc ('\n', stderr);
va_end (ap);
}
void
-warning0 (const char *msgid, ...)
+warning0 (const char *gmsgid, ...)
{
va_list ap;
- va_start (ap, msgid);
+ va_start (ap, gmsgid);
fprintf (stderr, _("%s: warning: "), exec_name);
- vfprintf (stderr, _(msgid), ap);
+ vfprintf (stderr, _(gmsgid), ap);
fputc ('\n', stderr);
va_end (ap);
}
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 9067dfc..632b7ec 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -96,13 +96,13 @@ static tree lookup_java_method2 (tree, tree, int);
static tree method_header (int, tree, tree, tree);
static void fix_method_argument_names (tree ,tree);
static tree method_declarator (tree, tree);
-static void parse_warning_context (tree cl, const char *msgid, ...);
+static void parse_warning_context (tree cl, const char *gmsgid, ...);
#ifdef USE_MAPPED_LOCATION
static void issue_warning_error_from_context
- (source_location, const char *msgid, va_list *);
+ (source_location, const char *gmsgid, va_list *);
#else
static void issue_warning_error_from_context
- (tree, const char *msgid, va_list *);
+ (tree, const char *gmsgid, va_list *);
#endif
static void parse_ctor_invocation_error (void);
static tree parse_jdk1_1_error (const char *);
@@ -3126,7 +3126,7 @@ issue_warning_error_from_context (
#else
tree cl,
#endif
- const char *msgid, va_list *ap)
+ const char *gmsgid, va_list *ap)
{
#ifdef USE_MAPPED_LOCATION
source_location saved_location = input_location;
@@ -3140,7 +3140,7 @@ issue_warning_error_from_context (
text.err_no = errno;
text.args_ptr = ap;
- text.format_spec = msgid;
+ text.format_spec = gmsgid;
pp_format_text (global_dc->printer, &text);
strncpy (buffer, pp_formatted_text (global_dc->printer), sizeof (buffer) - 1);
buffer[sizeof (buffer) - 1] = '\0';
@@ -3182,14 +3182,14 @@ issue_warning_error_from_context (
FUTURE/FIXME: change cl to be a source_location. */
void
-parse_error_context (tree cl, const char *msgid, ...)
+parse_error_context (tree cl, const char *gmsgid, ...)
{
va_list ap;
- va_start (ap, msgid);
+ va_start (ap, gmsgid);
#ifdef USE_MAPPED_LOCATION
- issue_warning_error_from_context (EXPR_LOCATION (cl), msgid, &ap);
+ issue_warning_error_from_context (EXPR_LOCATION (cl), gmsgid, &ap);
#else
- issue_warning_error_from_context (cl, msgid, &ap);
+ issue_warning_error_from_context (cl, gmsgid, &ap);
#endif
va_end (ap);
}
@@ -3198,16 +3198,16 @@ parse_error_context (tree cl, const char *msgid, ...)
FUTURE/FIXME: change cl to be a source_location. */
static void
-parse_warning_context (tree cl, const char *msgid, ...)
+parse_warning_context (tree cl, const char *gmsgid, ...)
{
va_list ap;
- va_start (ap, msgid);
+ va_start (ap, gmsgid);
do_warning = 1;
#ifdef USE_MAPPED_LOCATION
- issue_warning_error_from_context (EXPR_LOCATION (cl), msgid, &ap);
+ issue_warning_error_from_context (EXPR_LOCATION (cl), gmsgid, &ap);
#else
- issue_warning_error_from_context (cl, msgid, &ap);
+ issue_warning_error_from_context (cl, gmsgid, &ap);
#endif
do_warning = 0;
va_end (ap);
generated by cgit v1.1 at 2025-05-30 19:55:48 +0000