Move declaration of lang_frame_mismatch_warn to header.
Commit Message
Also makes it localizable.
gdb/ChangeLog:
2019-10-07 Christian Biesinger <cbiesinger@google.com>
* language.c (show_language_command): Pass lang_frame_mismatch_warn
through _().
(lang_frame_mismatch_warn): Make const, mark with N_(), and
move comment...
* language.h (lang_frame_mismatch_warn): ... here. Also add
declaration.
* top.c (lang_frame_mismatch_warn): Remove declaration.
(check_frame_language_change): Pass lang_frame_mismatch_warn
through _().
---
gdb/language.c | 9 ++++-----
gdb/language.h | 5 +++++
gdb/top.c | 4 +---
3 files changed, 10 insertions(+), 8 deletions(-)
Comments
>>>>> "Christian" == Christian Biesinger via gdb-patches <gdb-patches@sourceware.org> writes:
Christian> Also makes it localizable.
Christian> gdb/ChangeLog:
Christian> 2019-10-07 Christian Biesinger <cbiesinger@google.com>
Christian> * language.c (show_language_command): Pass lang_frame_mismatch_warn
Christian> through _().
Christian> (lang_frame_mismatch_warn): Make const, mark with N_(), and
Christian> move comment...
Christian> * language.h (lang_frame_mismatch_warn): ... here. Also add
Christian> declaration.
Christian> * top.c (lang_frame_mismatch_warn): Remove declaration.
Christian> (check_frame_language_change): Pass lang_frame_mismatch_warn
Christian> through _().
Thanks, this is ok.
Tom
On Tue, Oct 8, 2019 at 7:46 AM Tom Tromey <tom@tromey.com> wrote:
>
> >>>>> "Christian" == Christian Biesinger via gdb-patches <gdb-patches@sourceware.org> writes:
>
> Christian> Also makes it localizable.
> Christian> gdb/ChangeLog:
>
> Christian> 2019-10-07 Christian Biesinger <cbiesinger@google.com>
>
> Christian> * language.c (show_language_command): Pass lang_frame_mismatch_warn
> Christian> through _().
> Christian> (lang_frame_mismatch_warn): Make const, mark with N_(), and
> Christian> move comment...
> Christian> * language.h (lang_frame_mismatch_warn): ... here. Also add
> Christian> declaration.
> Christian> * top.c (lang_frame_mismatch_warn): Remove declaration.
> Christian> (check_frame_language_change): Pass lang_frame_mismatch_warn
> Christian> through _().
>
> Thanks, this is ok.
Thanks, pushed.
To ssh://sourceware.org/git/binutils-gdb.git
b7d9d3ee59..34916edc47 HEAD -> master
Christian
@@ -112,10 +112,9 @@ static const char *language;
static const char *range;
static const char *case_sensitive;
-/* Warning issued when current_language and the language of the current
- frame do not match. */
-char lang_frame_mismatch_warn[] =
-"Warning: the current language does not match this frame.";
+/* See language.h. */
+const char lang_frame_mismatch_warn[] =
+N_("Warning: the current language does not match this frame.");
/* This page contains the functions corresponding to GDB commands
and their helpers. */
@@ -147,7 +146,7 @@ show_language_command (struct ui_file *file, int from_tty,
if (flang != language_unknown
&& language_mode == language_mode_manual
&& current_language->la_language != flang)
- printf_filtered ("%s\n", lang_frame_mismatch_warn);
+ printf_filtered ("%s\n", _(lang_frame_mismatch_warn));
}
}
@@ -483,6 +483,11 @@ extern const struct language_defn *current_language;
extern const struct language_defn *expected_language;
+/* Warning issued when current_language and the language of the current
+ frame do not match. */
+
+extern const char lang_frame_mismatch_warn[];
+
/* language_mode ==
language_mode_auto: current_language automatically set upon selection
of scope (e.g. stack frame)
@@ -110,8 +110,6 @@ gen_ret_current_ui_field_ptr (struct ui_out *, current_uiout)
int inhibit_gdbinit = 0;
-extern char lang_frame_mismatch_warn[]; /* language.c */
-
/* Flag for whether we want to confirm potentially dangerous
operations. Default is yes. */
@@ -492,7 +490,7 @@ check_frame_language_change (void)
&& flang != language_unknown
&& flang != current_language->la_language)
{
- printf_filtered ("%s\n", lang_frame_mismatch_warn);
+ printf_filtered ("%s\n", _(lang_frame_mismatch_warn));
warned = 1;
}
}