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

constify some cli-utils stuff

Browse Source 
This constifies a few functions in cli-utils -- get_number_trailer and
friends -- and then fixes the fallout.

2014-07-30  Tom Tromey  <tromey@redhat.com>

	* breakpoint.c (map_breakpoint_numbers): Update.
	* cli/cli-utils.c (get_number_trailer): Make "pp" const.  Update.
	(get_number_const): New function.
	(get_number): Rewrite using get_number_const.
	(init_number_or_range): Make "string" const.
	(number_is_in_list): Make "list" const.
	* cli/cli-utils.h (get_number_const): Declare.
	(struct get_number_or_range_state) <string, end_ptr>: Now const.
	(init_number_or_range, number_is_in_list): Update.
	* printcmd.c (map_display_numbers): Update.
	* value.c (value_from_history_ref): Constify.
	* value.h (value_from_history_ref): Update.
This commit is contained in:
Tom Tromey
2014-07-22 10:47:53 -06:00
parent 5f08566b92
commit e799154c3b
7 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gdb/cli/cli-utils.c
View File

@ -35,10 +35,10 @@
commonly this is `-'. If you don't want a trailer, use \0. */
static int
get_number_trailer (char **pp, int trailer)
get_number_trailer (const char **pp, int trailer)
{
int retval = 0; /* default */
char *p = *pp;
const char *p = *pp;
if (*p == '$')
{
@ -59,7 +59,7 @@ get_number_trailer (char **pp, int trailer)
/* Internal variable. Make a copy of the name, so we can
null-terminate it to pass to lookup_internalvar(). */
char *varname;
char *start = ++p;
const char *start = ++p;
LONGEST val;
while (isalnum (*p) || *p == '_')
@ -102,7 +102,7 @@ get_number_trailer (char **pp, int trailer)
++p;
retval = 0;
}
p = skip_spaces (p);
p = skip_spaces_const (p);
*pp = p;
return retval;
}
@ -110,16 +110,29 @@ get_number_trailer (char **pp, int trailer)
/* See documentation in cli-utils.h. */
int
get_number (char **pp)
get_number_const (const char **pp)
{
return get_number_trailer (pp, '\0');
}
/* See documentation in cli-utils.h. */
int
get_number (char **pp)
{
int result;
const char *p = *pp;
result = get_number_trailer (&p, '\0');
*pp = (char *) p;
return result;
}
/* See documentation in cli-utils.h. */
void
init_number_or_range (struct get_number_or_range_state *state,
char *string)
const char *string)
{
memset (state, 0, sizeof (*state));
state->string = string;
@ -137,15 +150,15 @@ get_number_or_range (struct get_number_or_range_state *state)
state->last_retval = get_number_trailer (&state->string, '-');
if (*state->string == '-')
{
char **temp;
const char **temp;
/* This is the start of a range (<number1> - <number2>).
Skip the '-', parse and remember the second number,
and also remember the end of the final token. */
temp = &state->end_ptr;
state->end_ptr = skip_spaces (state->string + 1);
state->end_value = get_number (temp);
state->end_ptr = skip_spaces_const (state->string + 1);
state->end_value = get_number_const (temp);
if (state->end_value < state->last_retval)
{
error (_("inverted range"));
@ -191,7 +204,7 @@ get_number_or_range (struct get_number_or_range_state *state)
no arguments. */
int
number_is_in_list (char *list, int number)
number_is_in_list (const char *list, int number)
{
struct get_number_or_range_state state;