diff options
author | Tom Tromey <tom@tromey.com> | 2019-01-27 12:51:36 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2019-02-07 03:27:23 -0700 |
commit | 1a5c25988eabb35e0e40ea484b1eea029d9b7f53 (patch) | |
tree | 84c6f820847657cbb3a320ad7e1603cc42b2c3d9 /gdb/mi | |
parent | 31528deca52123a5a6dee19d47bee94dff041325 (diff) | |
download | gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.zip gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.tar.gz gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.tar.bz2 |
Normalize include guards in gdb
While working on my other scripts to deal with gdb headers, I noticed
that some files were missing include guards. I wrote a script to add
the missing ones, but found that using the obvious names for the
guards ran into clashes -- for example, gdb/nat/linux-nat.h used
"LINUX_NAT_H", but this was also the script's choice for
gdb/linux-nat.h.
So, I changed the script to normalize all include guards in gdb. This
patch is the result.
As usual the script is available here:
https://github.com/tromey/gdb-refactoring-scripts
Tested by rebuilding; I also ran it through "Fedora-x86_64-m64" on the
buildbot.
gdb/ChangeLog
2019-02-07 Tom Tromey <tom@tromey.com>
* yy-remap.h: Add include guard.
* xtensa-tdep.h: Add include guard.
* xcoffread.h: Rename include guard.
* varobj-iter.h: Add include guard.
* tui/tui.h: Rename include guard.
* tui/tui-winsource.h: Rename include guard.
* tui/tui-wingeneral.h: Rename include guard.
* tui/tui-windata.h: Rename include guard.
* tui/tui-win.h: Rename include guard.
* tui/tui-stack.h: Rename include guard.
* tui/tui-source.h: Rename include guard.
* tui/tui-regs.h: Rename include guard.
* tui/tui-out.h: Rename include guard.
* tui/tui-layout.h: Rename include guard.
* tui/tui-io.h: Rename include guard.
* tui/tui-hooks.h: Rename include guard.
* tui/tui-file.h: Rename include guard.
* tui/tui-disasm.h: Rename include guard.
* tui/tui-data.h: Rename include guard.
* tui/tui-command.h: Rename include guard.
* tic6x-tdep.h: Add include guard.
* target/waitstatus.h: Rename include guard.
* target/wait.h: Rename include guard.
* target/target.h: Rename include guard.
* target/resume.h: Rename include guard.
* target-float.h: Rename include guard.
* stabsread.h: Add include guard.
* rs6000-tdep.h: Add include guard.
* riscv-fbsd-tdep.h: Add include guard.
* regformats/regdef.h: Rename include guard.
* record.h: Rename include guard.
* python/python.h: Rename include guard.
* python/python-internal.h: Rename include guard.
* python/py-stopevent.h: Rename include guard.
* python/py-ref.h: Rename include guard.
* python/py-record.h: Rename include guard.
* python/py-record-full.h: Rename include guard.
* python/py-record-btrace.h: Rename include guard.
* python/py-instruction.h: Rename include guard.
* python/py-events.h: Rename include guard.
* python/py-event.h: Rename include guard.
* procfs.h: Add include guard.
* proc-utils.h: Add include guard.
* p-lang.h: Add include guard.
* or1k-tdep.h: Rename include guard.
* observable.h: Rename include guard.
* nto-tdep.h: Rename include guard.
* nat/x86-linux.h: Rename include guard.
* nat/x86-linux-dregs.h: Rename include guard.
* nat/x86-gcc-cpuid.h: Add include guard.
* nat/x86-dregs.h: Rename include guard.
* nat/x86-cpuid.h: Rename include guard.
* nat/ppc-linux.h: Rename include guard.
* nat/mips-linux-watch.h: Rename include guard.
* nat/linux-waitpid.h: Rename include guard.
* nat/linux-ptrace.h: Rename include guard.
* nat/linux-procfs.h: Rename include guard.
* nat/linux-osdata.h: Rename include guard.
* nat/linux-nat.h: Rename include guard.
* nat/linux-namespaces.h: Rename include guard.
* nat/linux-btrace.h: Rename include guard.
* nat/glibc_thread_db.h: Rename include guard.
* nat/gdb_thread_db.h: Rename include guard.
* nat/gdb_ptrace.h: Rename include guard.
* nat/fork-inferior.h: Rename include guard.
* nat/amd64-linux-siginfo.h: Rename include guard.
* nat/aarch64-sve-linux-sigcontext.h: Rename include guard.
* nat/aarch64-sve-linux-ptrace.h: Rename include guard.
* nat/aarch64-linux.h: Rename include guard.
* nat/aarch64-linux-hw-point.h: Rename include guard.
* mn10300-tdep.h: Add include guard.
* mips-linux-tdep.h: Add include guard.
* mi/mi-parse.h: Rename include guard.
* mi/mi-out.h: Rename include guard.
* mi/mi-main.h: Rename include guard.
* mi/mi-interp.h: Rename include guard.
* mi/mi-getopt.h: Rename include guard.
* mi/mi-console.h: Rename include guard.
* mi/mi-common.h: Rename include guard.
* mi/mi-cmds.h: Rename include guard.
* mi/mi-cmd-break.h: Rename include guard.
* m2-lang.h: Add include guard.
* location.h: Rename include guard.
* linux-record.h: Rename include guard.
* linux-nat.h: Add include guard.
* linux-fork.h: Add include guard.
* i386-darwin-tdep.h: Rename include guard.
* hppa-linux-offsets.h: Add include guard.
* guile/guile.h: Rename include guard.
* guile/guile-internal.h: Rename include guard.
* gnu-nat.h: Rename include guard.
* gdb-stabs.h: Rename include guard.
* frv-tdep.h: Add include guard.
* f-lang.h: Add include guard.
* event-loop.h: Add include guard.
* darwin-nat.h: Rename include guard.
* cp-abi.h: Rename include guard.
* config/sparc/nm-sol2.h: Rename include guard.
* config/nm-nto.h: Rename include guard.
* config/nm-linux.h: Add include guard.
* config/i386/nm-i386gnu.h: Rename include guard.
* config/djgpp/nl_types.h: Rename include guard.
* config/djgpp/langinfo.h: Rename include guard.
* compile/gcc-cp-plugin.h: Add include guard.
* compile/gcc-c-plugin.h: Add include guard.
* compile/compile.h: Rename include guard.
* compile/compile-object-run.h: Rename include guard.
* compile/compile-object-load.h: Rename include guard.
* compile/compile-internal.h: Rename include guard.
* compile/compile-cplus.h: Rename include guard.
* compile/compile-c.h: Rename include guard.
* common/xml-utils.h: Rename include guard.
* common/x86-xstate.h: Rename include guard.
* common/version.h: Rename include guard.
* common/vec.h: Rename include guard.
* common/tdesc.h: Rename include guard.
* common/selftest.h: Rename include guard.
* common/scoped_restore.h: Rename include guard.
* common/scoped_mmap.h: Rename include guard.
* common/scoped_fd.h: Rename include guard.
* common/safe-iterator.h: Rename include guard.
* common/run-time-clock.h: Rename include guard.
* common/refcounted-object.h: Rename include guard.
* common/queue.h: Rename include guard.
* common/ptid.h: Rename include guard.
* common/print-utils.h: Rename include guard.
* common/preprocessor.h: Rename include guard.
* common/pathstuff.h: Rename include guard.
* common/observable.h: Rename include guard.
* common/netstuff.h: Rename include guard.
* common/job-control.h: Rename include guard.
* common/host-defs.h: Rename include guard.
* common/gdb_wait.h: Rename include guard.
* common/gdb_vecs.h: Rename include guard.
* common/gdb_unlinker.h: Rename include guard.
* common/gdb_unique_ptr.h: Rename include guard.
* common/gdb_tilde_expand.h: Rename include guard.
* common/gdb_sys_time.h: Rename include guard.
* common/gdb_string_view.h: Rename include guard.
* common/gdb_splay_tree.h: Rename include guard.
* common/gdb_setjmp.h: Rename include guard.
* common/gdb_ref_ptr.h: Rename include guard.
* common/gdb_optional.h: Rename include guard.
* common/gdb_locale.h: Rename include guard.
* common/gdb_assert.h: Rename include guard.
* common/filtered-iterator.h: Rename include guard.
* common/filestuff.h: Rename include guard.
* common/fileio.h: Rename include guard.
* common/environ.h: Rename include guard.
* common/common-utils.h: Rename include guard.
* common/common-types.h: Rename include guard.
* common/common-regcache.h: Rename include guard.
* common/common-inferior.h: Rename include guard.
* common/common-gdbthread.h: Rename include guard.
* common/common-exceptions.h: Rename include guard.
* common/common-defs.h: Rename include guard.
* common/common-debug.h: Rename include guard.
* common/cleanups.h: Rename include guard.
* common/buffer.h: Rename include guard.
* common/btrace-common.h: Rename include guard.
* common/break-common.h: Rename include guard.
* cli/cli-utils.h: Rename include guard.
* cli/cli-style.h: Rename include guard.
* cli/cli-setshow.h: Rename include guard.
* cli/cli-script.h: Rename include guard.
* cli/cli-interp.h: Rename include guard.
* cli/cli-decode.h: Rename include guard.
* cli/cli-cmds.h: Rename include guard.
* charset-list.h: Add include guard.
* buildsym-legacy.h: Rename include guard.
* bfin-tdep.h: Add include guard.
* ax.h: Rename include guard.
* arm-linux-tdep.h: Add include guard.
* arm-fbsd-tdep.h: Add include guard.
* arch/xtensa.h: Rename include guard.
* arch/tic6x.h: Add include guard.
* arch/i386.h: Add include guard.
* arch/arm.h: Rename include guard.
* arch/arm-linux.h: Rename include guard.
* arch/arm-get-next-pcs.h: Rename include guard.
* arch/amd64.h: Add include guard.
* arch/aarch64-insn.h: Rename include guard.
* arch-utils.h: Rename include guard.
* annotate.h: Add include guard.
* amd64-darwin-tdep.h: Rename include guard.
* aarch64-linux-tdep.h: Add include guard.
* aarch64-fbsd-tdep.h: Add include guard.
* aarch32-linux-nat.h: Add include guard.
gdb/gdbserver/ChangeLog
2019-02-07 Tom Tromey <tom@tromey.com>
* x86-tdesc.h: Rename include guard.
* x86-low.h: Add include guard.
* wincecompat.h: Rename include guard.
* win32-low.h: Add include guard.
* utils.h: Rename include guard.
* tracepoint.h: Rename include guard.
* tdesc.h: Rename include guard.
* target.h: Rename include guard.
* server.h: Rename include guard.
* remote-utils.h: Rename include guard.
* regcache.h: Rename include guard.
* nto-low.h: Rename include guard.
* notif.h: Add include guard.
* mem-break.h: Rename include guard.
* lynx-low.h: Add include guard.
* linux-x86-tdesc.h: Add include guard.
* linux-s390-tdesc.h: Add include guard.
* linux-ppc-tdesc-init.h: Add include guard.
* linux-low.h: Add include guard.
* linux-aarch64-tdesc.h: Add include guard.
* linux-aarch32-low.h: Add include guard.
* inferiors.h: Rename include guard.
* i387-fp.h: Rename include guard.
* hostio.h: Rename include guard.
* gdbthread.h: Rename include guard.
* gdb_proc_service.h: Rename include guard.
* event-loop.h: Rename include guard.
* dll.h: Rename include guard.
* debug.h: Rename include guard.
* ax.h: Rename include guard.
Diffstat (limited to 'gdb/mi')
-rw-r--r-- | gdb/mi/mi-cmd-break.h | 7 | ||||
-rw-r--r-- | gdb/mi/mi-cmds.h | 6 | ||||
-rw-r--r-- | gdb/mi/mi-common.h | 6 | ||||
-rw-r--r-- | gdb/mi/mi-console.h | 6 | ||||
-rw-r--r-- | gdb/mi/mi-getopt.h | 8 | ||||
-rw-r--r-- | gdb/mi/mi-interp.h | 6 | ||||
-rw-r--r-- | gdb/mi/mi-main.h | 7 | ||||
-rw-r--r-- | gdb/mi/mi-out.h | 6 | ||||
-rw-r--r-- | gdb/mi/mi-parse.h | 6 |
9 files changed, 28 insertions, 30 deletions
diff --git a/gdb/mi/mi-cmd-break.h b/gdb/mi/mi-cmd-break.h index 3b69061..a68080d 100644 --- a/gdb/mi/mi-cmd-break.h +++ b/gdb/mi/mi-cmd-break.h @@ -18,8 +18,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MI_CMD_BREAK_H -#define MI_CMD_BREAK_H +#ifndef MI_MI_CMD_BREAK_H +#define MI_MI_CMD_BREAK_H #include "common/scoped_restore.h" @@ -27,5 +27,4 @@ catchpoint. */ scoped_restore_tmpl<int> setup_breakpoint_reporting (void); -#endif - +#endif /* MI_MI_CMD_BREAK_H */ diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h index af38363..7b22ce7 100644 --- a/gdb/mi/mi-cmds.h +++ b/gdb/mi/mi-cmds.h @@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MI_CMDS_H -#define MI_CMDS_H +#ifndef MI_MI_CMDS_H +#define MI_MI_CMDS_H enum print_values { PRINT_NO_VALUES, @@ -162,4 +162,4 @@ extern int mi_debug_p; extern void mi_execute_command (const char *cmd, int from_tty); -#endif +#endif /* MI_MI_CMDS_H */ diff --git a/gdb/mi/mi-common.h b/gdb/mi/mi-common.h index 1589f8d..4fb2d75 100644 --- a/gdb/mi/mi-common.h +++ b/gdb/mi/mi-common.h @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MI_COMMON_H -#define MI_COMMON_H +#ifndef MI_MI_COMMON_H +#define MI_MI_COMMON_H #include "interps.h" @@ -90,4 +90,4 @@ public: struct ui_out *cli_uiout; }; -#endif +#endif /* MI_MI_COMMON_H */ diff --git a/gdb/mi/mi-console.h b/gdb/mi/mi-console.h index 90e592f..e7a1c35 100644 --- a/gdb/mi/mi-console.h +++ b/gdb/mi/mi-console.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MI_CONSOLE_H -#define MI_CONSOLE_H +#ifndef MI_MI_CONSOLE_H +#define MI_MI_CONSOLE_H /* An output stream for MI. Wraps a given output stream with a prefix and handles quoting. This stream is locally buffered. */ @@ -55,4 +55,4 @@ private: char m_quote; }; -#endif +#endif /* MI_MI_CONSOLE_H */ diff --git a/gdb/mi/mi-getopt.h b/gdb/mi/mi-getopt.h index 7a6d34b..1513bb5 100644 --- a/gdb/mi/mi-getopt.h +++ b/gdb/mi/mi-getopt.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MI_GETOPT_H -#define MI_GETOPT_H +#ifndef MI_MI_GETOPT_H +#define MI_MI_GETOPT_H /* The option list. Terminated by NAME==NULL. ARG_P that the option requires an argument. INDEX is returned to identify the option. */ @@ -74,5 +74,5 @@ extern int mi_getopt_allow_unknown (const char *prefix, int argc, and the appropriate error message is displayed by mi_getopt. */ extern int mi_valid_noargs (const char *prefix, int argc, char **argv); - -#endif + +#endif /* MI_MI_GETOPT_H */ diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index 2ea3e6e..b1897d9 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -17,11 +17,11 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MI_INTERP_H -#define MI_INTERP_H +#ifndef MI_MI_INTERP_H +#define MI_MI_INTERP_H /* Output the shared object attributes to UIOUT. */ void mi_output_solib_attribs (ui_out *uiout, struct so_list *solib); -#endif +#endif /* MI_MI_INTERP_H */ diff --git a/gdb/mi/mi-main.h b/gdb/mi/mi-main.h index a81aa9c..72ddab9 100644 --- a/gdb/mi/mi-main.h +++ b/gdb/mi/mi-main.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MI_MAIN_H -#define MI_MAIN_H +#ifndef MI_MI_MAIN_H +#define MI_MI_MAIN_H struct ui_file; @@ -54,5 +54,4 @@ struct mi_suppress_notification }; extern struct mi_suppress_notification mi_suppress_notification; -#endif - +#endif /* MI_MI_MAIN_H */ diff --git a/gdb/mi/mi-out.h b/gdb/mi/mi-out.h index 237872f..0c74eaf 100644 --- a/gdb/mi/mi-out.h +++ b/gdb/mi/mi-out.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MI_OUT_H -#define MI_OUT_H 1 +#ifndef MI_MI_OUT_H +#define MI_MI_OUT_H #include <vector> @@ -95,4 +95,4 @@ int mi_version (ui_out *uiout); void mi_out_put (ui_out *uiout, struct ui_file *stream); void mi_out_rewind (ui_out *uiout); -#endif /* MI_OUT_H */ +#endif /* MI_MI_OUT_H */ diff --git a/gdb/mi/mi-parse.h b/gdb/mi/mi-parse.h index d9d36fb..2262ff5 100644 --- a/gdb/mi/mi-parse.h +++ b/gdb/mi/mi-parse.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MI_PARSE_H -#define MI_PARSE_H +#ifndef MI_MI_PARSE_H +#define MI_MI_PARSE_H #include "common/run-time-clock.h" #include <chrono> @@ -79,4 +79,4 @@ extern std::unique_ptr<struct mi_parse> mi_parse (const char *cmd, enum print_values mi_parse_print_values (const char *name); -#endif +#endif /* MI_MI_PARSE_H */ |