Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-11-16 12:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdbsupport: format_pieces: declare variables when needed

Browse Source 
I think it makes the code slightly easier to understand.

Change-Id: I49056728e43fbf37c2af8f3904a543c10e987bba
Reviewed-By: Keith Seitz <keiths@redhat.com>
This commit is contained in:
Simon Marchi
2025-08-20 12:50:06 -04:00
committed by Simon Marchi
parent 986d1a5c29
commit 67a611d658
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gdbsupport/format.cc
View File

@@ -22,14 +22,8 @@
format_pieces::format_pieces (const char **arg, bool gdb_extensions, format_pieces::format_pieces (const char **arg, bool gdb_extensions,
bool value_extension) bool value_extension)
{ {
const char *s; const char *s = *arg;
const char *string; const char *string;
const char *prev_start;
const char *percent_loc;
char *sub_start, *current_substring;
enum argclass this_argclass;
s = *arg;
if (gdb_extensions) if (gdb_extensions)
{ {
@@ -106,16 +100,15 @@ format_pieces::format_pieces (const char **arg, bool gdb_extensions,
} }
/* Need extra space for the '\0's. Doubling the size is sufficient. */ /* Need extra space for the '\0's. Doubling the size is sufficient. */
char *current_substring = (char *) xmalloc (strlen (string) * 2 + 1000);
current_substring = (char *) xmalloc (strlen (string) * 2 + 1000);
m_storage.reset (current_substring); m_storage.reset (current_substring);
/* Now scan the string for %-specs and see what kinds of args they want. /* Now scan the string for %-specs and see what kinds of args they want.
argclass classifies the %-specs so we can give printf-type functions argclass classifies the %-specs so we can give printf-type functions
something of the right size. */ something of the right size. */
const char *f = string; const char *f = string;
prev_start = string; const char *prev_start = string;
while (*f) while (*f)
if (*f++ == '%') if (*f++ == '%')
{ {
@@ -135,7 +128,7 @@ format_pieces::format_pieces (const char **arg, bool gdb_extensions,
continue; continue;
} }
sub_start = current_substring; const char *sub_start = current_substring;
strncpy (current_substring, prev_start, f - 1 - prev_start); strncpy (current_substring, prev_start, f - 1 - prev_start);
current_substring += f - 1 - prev_start; current_substring += f - 1 - prev_start;
@@ -144,7 +137,7 @@ format_pieces::format_pieces (const char **arg, bool gdb_extensions,
if (*sub_start != '\0') if (*sub_start != '\0')
m_pieces.emplace_back (sub_start, literal_piece, 0); m_pieces.emplace_back (sub_start, literal_piece, 0);
percent_loc = f - 1; const char *percent_loc = f - 1;
/* Check the validity of the format specifier, and work /* Check the validity of the format specifier, and work
out what argument it expects. We only accept C89 out what argument it expects. We only accept C89
@@ -251,6 +244,8 @@ format_pieces::format_pieces (const char **arg, bool gdb_extensions,
break; break;
} }
argclass this_argclass;
switch (*f) switch (*f)
{ {
case 'u': case 'u':
@@ -422,7 +417,7 @@ format_pieces::format_pieces (const char **arg, bool gdb_extensions,
if (f > prev_start) if (f > prev_start)
{ {
sub_start = current_substring; const char *sub_start = current_substring;
strncpy (current_substring, prev_start, f - prev_start); strncpy (current_substring, prev_start, f - prev_start);
current_substring += f - prev_start; current_substring += f - prev_start;