espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-26 13:56:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove LA_PRINT_STRING

Browse Source 
This removes the LA_PRINT_STRING macro, in favor of using ordinary
method calls.
This commit is contained in:
Tom Tromey
2022-01-22 16:32:48 -07:00
parent 362501dc5c
commit 660da3c14b
4 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/c-valprint.c
View File

@ -277,7 +277,7 @@ c_value_print_array (struct value *val,
++temp_len) ++temp_len)
; ;
/* Force LA_PRINT_STRING to print ellipses if /* Force printstr to print ellipses if
we've printed the maximum characters and we've printed the maximum characters and
the next character is not \000. */ the next character is not \000. */
if (temp_len == options->print_max && temp_len < len) if (temp_len == options->print_max && temp_len < len)
@ -292,8 +292,8 @@ c_value_print_array (struct value *val,
len = temp_len; len = temp_len;
} }
LA_PRINT_STRING (stream, unresolved_elttype, valaddr, len, current_language->printstr (stream, unresolved_elttype, valaddr, len,
NULL, force_ellipses, options); NULL, force_ellipses, options);
} }
else else
{ {

9
gdb/language.h
View File

@ -750,15 +750,6 @@ extern void language_info ();
extern enum language set_language (enum language); extern enum language set_language (enum language);
/* This page contains functions that return things that are
specific to languages. Each of these functions is based on
the current setting of working_lang, which the user sets
with the "set language" command. */
#define LA_PRINT_STRING(stream, elttype, string, length, encoding, force_ellipses, options) \
(current_language->printstr (stream, elttype, string, length, \
encoding, force_ellipses,options))
/* Test a character to decide whether it can be printed in literal form /* Test a character to decide whether it can be printed in literal form
or needs to be printed in another representation. For example, or needs to be printed in another representation. For example,
in C the literal form of the character with octal value 141 is 'a' in C the literal form of the character with octal value 141 is 'a'

7
gdb/valprint.c
View File

@ -2767,10 +2767,9 @@ val_print_string (struct type *elttype, const char *encoding,
But if we fetch something and then get an error, print the string But if we fetch something and then get an error, print the string
and then the error message. */ and then the error message. */
if (err == 0 || bytes_read > 0) if (err == 0 || bytes_read > 0)
{ current_language->printstr (stream, elttype, buffer.get (),
LA_PRINT_STRING (stream, elttype, buffer.get (), bytes_read / width, bytes_read / width,
encoding, force_ellipsis, options); encoding, force_ellipsis, options);
}
if (err != 0) if (err != 0)
{ {

4
gdb/varobj.c
View File

@ -2232,8 +2232,8 @@ varobj_value_get_print_value (struct value *value,
/* If the THEVALUE has contents, it is a regular string. */ /* If the THEVALUE has contents, it is a regular string. */
if (!thevalue.empty ()) if (!thevalue.empty ())
LA_PRINT_STRING (&stb, type, (gdb_byte *) thevalue.c_str (), current_language->printstr (&stb, type, (gdb_byte *) thevalue.c_str (),
len, encoding.get (), 0, &opts); len, encoding.get (), 0, &opts);
else if (string_print) else if (string_print)
/* Otherwise, if string_print is set, and it is not a regular /* Otherwise, if string_print is set, and it is not a regular
string, it is a lazy string. */ string, it is a lazy string. */