Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

-Wwrite-strings: Some constification in gdb/breakpoint.c

Browse Source 
The main motivation here is avoiding having to write a couple casts
like these:

     if (!arg)
  -    arg = "";
  +    arg = (char *) "";

in catch_exception_command_1 and catch_exec_command_1.

That requires making ep_parse_optional_if_clause and
check_for_argument take pointers to const strings.  I then tried
propagating the resulting constification all the way, but that was
spiraling out of control, so instead I settled for keeping const and
non-const overloads.

gdb/ChangeLog:
2017-04-05  Pedro Alves  <palves@redhat.com>

	* break-catch-throw.c (handle_gnu_v3_exceptions): Constify
	'cond_string' parameter.
	(extract_exception_regexp): Constify 'string' parameter.
	(catch_exception_command_1): Constify.
	* breakpoint.c (init_catchpoint)
	(create_fork_vfork_event_catchpoint): Constify 'cond_string'
	parameter.
	(ep_parse_optional_if_clause, catch_fork_command_1)
	(catch_exec_command_1): Constify.
	* breakpoint.h (init_catchpoint): Constify 'cond_string'
	parameter.
	(ep_parse_optional_if_clause): Constify.
	* cli/cli-utils.c (remove_trailing_whitespace)
	(check_for_argument): Constify.
	* cli/cli-utils.h (remove_trailing_whitespace): Constify and add
	non-const overload.
	(check_for_argument): Likewise.
This commit is contained in:
Pedro Alves
2017-04-05 19:21:36 +01:00
parent 9b2eba3dcc
commit 63160a4350
6 changed files with 72 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gdb/cli/cli-utils.h
View File

@@ -137,7 +137,16 @@ extern int number_is_in_list (const char *list, int number);
/* Reverse S to the last non-whitespace character without skipping past
START. */
extern char *remove_trailing_whitespace (const char *start, char *s);
extern const char *remove_trailing_whitespace (const char *start,
const char *s);
/* Same, for non-const S. */
static inline char *
remove_trailing_whitespace (const char *start, char *s)
{
return (char *) remove_trailing_whitespace (start, (const char *) s);
}
/* A helper function to extract an argument from *ARG. An argument is
delimited by whitespace. The return value is either NULL if no
@@ -156,6 +165,15 @@ extern char *extract_arg_const (const char **arg);
string. The argument must also either be at the end of the string,
or be followed by whitespace. Returns 1 if it finds the argument,
0 otherwise. If the argument is found, it updates *STR. */
extern int check_for_argument (char **str, char *arg, int arg_len);
extern int check_for_argument (const char **str, const char *arg, int arg_len);
/* Same, for non-const STR. */
static inline int
check_for_argument (char **str, const char *arg, int arg_len)
{
return check_for_argument (const_cast<const char **> (str),
arg, arg_len);
}
#endif /* CLI_UTILS_H */