mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-02-23 13:21:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

* breakpoint.c (add_catch_command): Use completer_ftype.

Browse Source 
* breakpoint.h: Include command.h.
	(add_catch_command): Use completer_ftype.
	* cli/cli-decode.c (set_cmd_completer): Use completer_ftype.
	* cli/cli-decode.h (struct cmd_list_element) <completer>:
	Use completer_ftype.
	* command.h (completer_ftype): New typedef.
	(set_cmd_completer): Use it.
	* python/py-cmd.c (struct cmdpy_completer) <completer>: Use
	completer_ftype.
This commit is contained in:
Tom Tromey 2012-06-13 15:41:24 +00:00
parent 1a43faafe7
commit 625e8578d7
7 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gdb/ChangeLog
View File

@ -1,3 +1,16 @@
2012-06-13 Tom Tromey <tromey@redhat.com>
* breakpoint.c (add_catch_command): Use completer_ftype.
* breakpoint.h: Include command.h.
(add_catch_command): Use completer_ftype.
* cli/cli-decode.c (set_cmd_completer): Use completer_ftype.
* cli/cli-decode.h (struct cmd_list_element) <completer>:
Use completer_ftype.
* command.h (completer_ftype): New typedef.
(set_cmd_completer): Use it.
* python/py-cmd.c (struct cmdpy_completer) <completer>: Use
completer_ftype.
2012-06-13 Pedro Alves <palves@redhat.com>
Partial revert of previous change.

3
gdb/breakpoint.c
View File

@ -15200,8 +15200,7 @@ void
add_catch_command (char *name, char *docstring,
void (*sfunc) (char *args, int from_tty,
struct cmd_list_element *command),
char **(*completer) (struct cmd_list_element *cmd,
char *text, char *word),
completer_ftype *completer,
void *user_data_catch,
void *user_data_tcatch)
{

4
gdb/breakpoint.h
View File

@ -23,6 +23,7 @@
#include "value.h"
#include "vec.h"
#include "ax.h"
#include "command.h"
struct value;
struct block;
@ -1187,8 +1188,7 @@ extern void
add_catch_command (char *name, char *docstring,
void (*sfunc) (char *args, int from_tty,
struct cmd_list_element *command),
char **(*completer) (struct cmd_list_element *cmd,
char *text, char *word),
completer_ftype *completer,
void *user_data_catch,
void *user_data_tcatch);

4
gdb/cli/cli-decode.c
View File

@ -119,9 +119,7 @@ cmd_type (struct cmd_list_element *cmd)
}
void
set_cmd_completer (struct cmd_list_element *cmd,
char **(*completer) (struct cmd_list_element *self,
char *text, char *word))
set_cmd_completer (struct cmd_list_element *cmd, completer_ftype *completer)
{
cmd->completer = completer; /* Ok. */
}

3
gdb/cli/cli-decode.h
View File

@ -168,8 +168,7 @@ struct cmd_list_element
For example, suppose TEXT is "foo" and we want to complete to
"foobar". If WORD is "oo", return "oobar"; if WORD is
"baz/foo", return "baz/foobar". */
char **(*completer) (struct cmd_list_element *cmd,
char *text, char *word);
completer_ftype *completer;
/* Destruction routine for this command. If non-NULL, this is
called when this command instance is destroyed. This may be

6
gdb/command.h
View File

@ -149,9 +149,9 @@ typedef void cmd_sfunc_ftype (char *args, int from_tty,
extern void set_cmd_sfunc (struct cmd_list_element *cmd,
cmd_sfunc_ftype *sfunc);
extern void set_cmd_completer (struct cmd_list_element *,
char **(*completer) (struct cmd_list_element *,
char *, char *));
typedef char **completer_ftype (struct cmd_list_element *, char *, char *);
extern void set_cmd_completer (struct cmd_list_element *, completer_ftype *);
/* HACK: cagney/2002-02-23: Code, mostly in tracepoints.c, grubs
around in cmd objects to test the value of the commands sfunc(). */

2
gdb/python/py-cmd.c
View File

@ -35,7 +35,7 @@ struct cmdpy_completer
/* Python symbol name. */
char *name;
/* Completion function. */
char **(*completer) (struct cmd_list_element *, char *, char *);
completer_ftype *completer;
};
static struct cmdpy_completer completers[] =