Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 17:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move declaration of lang_frame_mismatch_warn to header.

Browse Source 
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 _().
This commit is contained in:
Christian Biesinger
2019-10-07 12:55:44 -05:00
parent b7d9d3ee59
commit 34916edc47
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gdb/ChangeLog
View File

@@ -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.

9
gdb/language.c
View File

@@ -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));
}
}

5
gdb/language.h
View File

@@ -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)

4
gdb/top.c
View File

@@ -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;
}
}