From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elena Zannoni To: gdb-patches@sources.redhat.com Subject: [PATCH/RFA] Remove 'extern' from top.c Date: Sun, 15 Jul 2001 14:02:00 -0000 Message-id: <15186.4788.515013.712500@krustylu.cygnus.com> X-SW-Source: 2001-07/msg00358.html This patch removes some externs (not all of them yet) from top.c. In part is an obvious fix (also, it is in a file I maintain), in part it is outside of my area (Fernando/Andrew ?). OK? Elena 2001-07-15 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. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.98 diff -u -p -r1.98 Makefile.in --- Makefile.in 2001/07/15 18:57:06 1.98 +++ Makefile.in 2001/07/15 20:25:30 @@ -1585,7 +1585,8 @@ inflow.o: inflow.c $(bfd_h) $(command_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) $(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 \ Index: command.h =================================================================== RCS file: /cvs/src/src/gdb/command.h,v retrieving revision 1.17 diff -u -p -r1.17 command.h --- command.h 2001/03/06 08:21:06 1.17 +++ command.h 2001/07/15 20:25:31 @@ -344,13 +344,6 @@ extern struct cmd_list_element *add_show 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 *); Index: gdbcmd.h =================================================================== RCS file: /cvs/src/src/gdb/gdbcmd.h,v retrieving revision 1.6 diff -u -p -r1.6 gdbcmd.h --- gdbcmd.h 2001/07/15 18:57:06 1.6 +++ gdbcmd.h 2001/07/15 20:25:31 @@ -112,8 +112,6 @@ extern struct cmd_list_element *setcheck 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 *); Index: infrun.c =================================================================== RCS file: /cvs/src/src/gdb/infrun.c,v retrieving revision 1.44 diff -u -p -r1.44 infrun.c --- infrun.c 2001/07/14 18:59:07 1.44 +++ infrun.c 2001/07/15 20:25:36 @@ -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" Index: top.c =================================================================== RCS file: /cvs/src/src/gdb/top.c,v retrieving revision 1.38 diff -u -p -r1.38 top.c --- top.c 2001/07/15 20:45:32 1.38 +++ top.c 2001/07/15 21:00:34 @@ -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 (); Index: cli-setshow.h =================================================================== RCS file: /cvs/src/src/gdb/cli/cli-setshow.h,v retrieving revision 1.2 diff -u -p -r1.2 cli-setshow.h --- cli-setshow.h 2001/03/06 08:21:20 1.2 +++ cli-setshow.h 2001/07/15 20:22:38 @@ -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);