diff options
| author | Christian Biesinger <cbiesinger@google.com> | 2019-10-07 12:55:44 -0500 |
|---|---|---|
| committer | Christian Biesinger <cbiesinger@google.com> | 2019-10-08 10:14:57 -0500 |
| commit | 34916edc47a26d591bf95784cd90fe1dcd533ab5 (patch) | |
| tree | 6014b017e3b13e6b363dffa815f3a2b2c825c589 | |
| parent | b7d9d3ee59236d6039d7d7ccd17ff6b47e07a8aa (diff) | |
| download | binutils-34916edc47a26d591bf95784cd90fe1dcd533ab5.zip binutils-34916edc47a26d591bf95784cd90fe1dcd533ab5.tar.gz binutils-34916edc47a26d591bf95784cd90fe1dcd533ab5.tar.bz2 | |
Move declaration of lang_frame_mismatch_warn to header.
Also makes it localizable.
gdb/ChangeLog:
2019-10-08 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 _().
| -rw-r--r-- | gdb/ChangeLog | 12 | ||||
| -rw-r--r-- | gdb/language.c | 9 | ||||
| -rw-r--r-- | gdb/language.h | 5 | ||||
| -rw-r--r-- | gdb/top.c | 4 |
4 files changed, 22 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3912429..20a001e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2019-10-08 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 _(). + 2019-10-07 Christian Biesinger <cbiesinger@google.com> * c-lang.h (vtbl_ptr_name): Declare. diff --git a/gdb/language.c b/gdb/language.c index e95084f..02c448f 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -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)); } } diff --git a/gdb/language.h b/gdb/language.h index 0088e5d..aa19f8e 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -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; } } |