From 210661e72f813f88355073842a68bcad63eb6760 Mon Sep 17 00:00:00 2001 From: Elena Zannoni Date: Mon, 16 Jul 2001 14:46:34 +0000 Subject: [PATCH] 2001-07-16 Elena Zannoni * top.c (is_complete_command, init_cmd_lists, init_cli_cmds, execute_user_command, do_setshow_command, get_prompt, init_proc, serial_log_command): Remove extern declarations. Include cli/cli-cmds.h, cli/cli-script.h, cli/cli-setshow.h, serial.h. * gdbcmd.h (execute_user_command): Remove declaration, it's already in cli/cli-script.h. * command.h (do_setshow_command): Remove declaration, it's already in cli/cli-setshow.h. * infrun.c: Include "cli/cli-script.h" for execute_user_command. * Makefile.in (infrun.o): Update dependencies. (top.o): Ditto. * cli/cli-setshow.h: Add comment for do_setshow_command. --- gdb/ChangeLog | 15 +++++++++++++++ gdb/Makefile.in | 7 +++++-- gdb/cli/cli-setshow.h | 6 +++++- gdb/command.h | 7 ------- gdb/gdbcmd.h | 2 -- gdb/infrun.c | 1 + gdb/top.c | 25 ++++--------------------- 7 files changed, 30 insertions(+), 33 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 69a3975..d578419 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,18 @@ +2001-07-16 Elena Zannoni + + * top.c (is_complete_command, init_cmd_lists, init_cli_cmds, + execute_user_command, do_setshow_command, get_prompt, init_proc, + serial_log_command): Remove extern declarations. Include + cli/cli-cmds.h, cli/cli-script.h, cli/cli-setshow.h, serial.h. + * gdbcmd.h (execute_user_command): Remove declaration, it's already + in cli/cli-script.h. + * command.h (do_setshow_command): Remove declaration, it's already + in cli/cli-setshow.h. + * infrun.c: Include "cli/cli-script.h" for execute_user_command. + * Makefile.in (infrun.o): Update dependencies. + (top.o): Ditto. + * cli/cli-setshow.h: Add comment for do_setshow_command. + 2001-07-16 Eli Zaretskii * cli/cli-cmds.c (shell_escape) [GLOBAL_CURDIR]: Condition the diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 691dc49..fb295b8 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1585,7 +1585,8 @@ inflow.o: inflow.c $(bfd_h) $(command_h) $(defs_h) $(inferior_h) \ infptrace.o: infptrace.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \ $(gdb_string_h) gdb_wait.h $(command_h) $(regcache_h) -infrun.o: infrun.c gdb_wait.h $(defs_h) $(gdbcmd_h) $(gdbcore_h) \ +infrun.o: infrun.c gdb_wait.h $(defs_h) $(gdbcmd_h) $(cli_script_h) \ + $(gdbcore_h) \ $(inferior_h) target.h gdbthread.h $(gdb_string_h) $(event_loop_h) \ $(event_top_h) $(regcache_h) @@ -2039,9 +2040,11 @@ completer.o: completer.c $(completer_h) $(gdbtypes_h) $(symtab_h) \ $(defs_h) $(gdbcmd_h) $(expression_h) $(readline_headers) top.o: top.c top.h $(bfd_h) $(getopt_h) $(readline_headers) call-cmds.h \ + $(cli_cmds_h) $(cli_script_h) $(cli_setshow_h) \ $(defs_h) $(gdbcmd_h) $(inferior_h) language.h \ $(remote_utils_h) $(gdb_string_h) $(event_loop_h) $(event_top_h) \ - $(completer_h) $(version_h) $(ui_out_h) + $(completer_h) $(version_h) $(ui_out_h) \ + serial.h typeprint.o: typeprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \ $(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) target.h \ diff --git a/gdb/cli/cli-setshow.h b/gdb/cli/cli-setshow.h index e9337dc..393612a 100644 --- a/gdb/cli/cli-setshow.h +++ b/gdb/cli/cli-setshow.h @@ -1,5 +1,5 @@ /* Header file for GDB CLI set and show commands implementation. - Copyright 2000 Free Software Foundation, Inc. + Copyright 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,6 +21,10 @@ /* Exported to cli/cli-cmds.c and gdb/top.c */ +/* Do a "set" or "show" command. ARG is NULL if no argument, or the text + of the argument, and FROM_TTY is nonzero if this command is being entered + directly by the user (i.e. these are just like any other + command). C is the command list element for the command. */ extern void do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c); diff --git a/gdb/command.h b/gdb/command.h index 362bfd8..ac52821 100644 --- a/gdb/command.h +++ b/gdb/command.h @@ -344,13 +344,6 @@ extern struct cmd_list_element *add_show_from_set (struct cmd_list_element *, struct cmd_list_element **); -/* Do a "set" or "show" command. ARG is NULL if no argument, or the text - of the argument, and FROM_TTY is nonzero if this command is being entered - directly by the user (i.e. these are just like any other - command). C is the command list element for the command. */ - -extern void do_setshow_command (char *, int, struct cmd_list_element *); - /* Do a "show" command for each thing on a command list. */ extern void cmd_show_list (struct cmd_list_element *, int, char *); diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h index c3d79e4..1b45938 100644 --- a/gdb/gdbcmd.h +++ b/gdb/gdbcmd.h @@ -112,8 +112,6 @@ extern struct cmd_list_element *setchecklist; extern struct cmd_list_element *showchecklist; -extern void execute_user_command (struct cmd_list_element *, char *); - extern void execute_command (char *, int); enum command_control_type execute_control_command (struct command_line *); diff --git a/gdb/infrun.c b/gdb/infrun.c index f66298b..fa25006 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -29,6 +29,7 @@ #include "gdb_wait.h" #include "gdbcore.h" #include "gdbcmd.h" +#include "cli/cli-script.h" #include "target.h" #include "gdbthread.h" #include "annotate.h" diff --git a/gdb/top.c b/gdb/top.c index 6fc9275..b0dc671 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -22,6 +22,9 @@ #include "defs.h" #include "gdbcmd.h" #include "call-cmds.h" +#include "cli/cli-cmds.h" +#include "cli/cli-script.h" +#include "cli/cli-setshow.h" #include "symtab.h" #include "inferior.h" #include @@ -36,6 +39,7 @@ #include "completer.h" #include "top.h" #include "version.h" +#include "serial.h" /* readline include files */ #include @@ -57,22 +61,6 @@ #include "cli-out.h" #endif -/* From completer.c */ - -extern int is_complete_command (void (*func) (char *args, int from_tty)); - -/* From cli/cli-cmds.c */ - -extern void init_cmd_lists (void); - -extern void init_cli_cmds (void); - -extern void execute_user_command (struct cmd_list_element *c, char *args); - -/* From cli/cli-setshow.c */ - -extern void do_setshow_command (char *, int, struct cmd_list_element *); - /* Default command line prompt. This is overriden in some configs. */ #ifndef DEFAULT_PROMPT @@ -123,7 +111,6 @@ int xgdb_verbose; /* gdb prints this when reading a command interactively */ static char *gdb_prompt_string; /* the global prompt string */ -extern char *get_prompt (void); /* access function for prompt string */ /* Buffer used for reading command lines, and the size allocated for it so far. */ @@ -592,8 +579,6 @@ read_command_file (FILE *stream) do_cleanups (cleanups); } -extern void init_proc (void); - void (*pre_init_ui_hook) (void); #ifdef __MSDOS__ @@ -615,8 +600,6 @@ execute_command (char *p, int from_tty) register enum language flang; static int warned = 0; char *line; - /* FIXME: These should really be in an appropriate header file */ - extern void serial_log_command (const char *); free_all_values (); -- 2.7.4