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/compile | |
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/compile')
-rw-r--r-- | gdb/compile/compile-c.h | 6 | ||||
-rw-r--r-- | gdb/compile/compile-cplus.h | 6 | ||||
-rw-r--r-- | gdb/compile/compile-internal.h | 6 | ||||
-rw-r--r-- | gdb/compile/compile-object-load.h | 6 | ||||
-rw-r--r-- | gdb/compile/compile-object-run.h | 6 | ||||
-rw-r--r-- | gdb/compile/compile.h | 6 | ||||
-rw-r--r-- | gdb/compile/gcc-c-plugin.h | 5 | ||||
-rw-r--r-- | gdb/compile/gcc-cp-plugin.h | 5 |
8 files changed, 28 insertions, 18 deletions
diff --git a/gdb/compile/compile-c.h b/gdb/compile/compile-c.h index ecb69df..b5a2194 100644 --- a/gdb/compile/compile-c.h +++ b/gdb/compile/compile-c.h @@ -14,8 +14,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 GDB_COMPILE_C_H -#define GDB_COMPILE_C_H +#ifndef COMPILE_COMPILE_C_H +#define COMPILE_COMPILE_C_H #include "common/enum-flags.h" #include "gcc-c-plugin.h" @@ -92,4 +92,4 @@ extern std::string c_get_range_decl_name (const struct dynamic_prop *prop); extern gdb::unique_xmalloc_ptr<char> c_symbol_substitution_name (struct symbol *sym); -#endif /* GDB_COMPILE_C_H */ +#endif /* COMPILE_COMPILE_C_H */ diff --git a/gdb/compile/compile-cplus.h b/gdb/compile/compile-cplus.h index 8979942..e5ea7d7 100644 --- a/gdb/compile/compile-cplus.h +++ b/gdb/compile/compile-cplus.h @@ -14,8 +14,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 GDB_COMPILE_CPLUS_H -#define GDB_COMPILE_CPLUS_H +#ifndef COMPILE_COMPILE_CPLUS_H +#define COMPILE_COMPILE_CPLUS_H #include "common/enum-flags.h" #include "gcc-cp-plugin.h" @@ -202,4 +202,4 @@ private: enum gcc_cp_symbol_kind get_method_access_flag (const struct type *type, int fni, int num); -#endif /* GDB_COMPILE_CPLUS_H */ +#endif /* COMPILE_COMPILE_CPLUS_H */ diff --git a/gdb/compile/compile-internal.h b/gdb/compile/compile-internal.h index 90e8292..406a369 100644 --- a/gdb/compile/compile-internal.h +++ b/gdb/compile/compile-internal.h @@ -14,8 +14,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 GDB_COMPILE_INTERNAL_H -#define GDB_COMPILE_INTERNAL_H +#ifndef COMPILE_COMPILE_INTERNAL_H +#define COMPILE_COMPILE_INTERNAL_H #include "gcc-c-interface.h" @@ -207,4 +207,4 @@ private: std::string m_object_file; }; -#endif /* GDB_COMPILE_INTERNAL_H */ +#endif /* COMPILE_COMPILE_INTERNAL_H */ diff --git a/gdb/compile/compile-object-load.h b/gdb/compile/compile-object-load.h index 33cc292..730164f 100644 --- a/gdb/compile/compile-object-load.h +++ b/gdb/compile/compile-object-load.h @@ -14,8 +14,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 GDB_COMPILE_OBJECT_LOAD_H -#define GDB_COMPILE_OBJECT_LOAD_H +#ifndef COMPILE_COMPILE_OBJECT_LOAD_H +#define COMPILE_COMPILE_OBJECT_LOAD_H #include "compile-internal.h" #include <list> @@ -82,4 +82,4 @@ extern struct compile_module *compile_object_load enum compile_i_scope_types scope, void *scope_data); extern void munmap_list_free (struct munmap_list *head); -#endif /* GDB_COMPILE_OBJECT_LOAD_H */ +#endif /* COMPILE_COMPILE_OBJECT_LOAD_H */ diff --git a/gdb/compile/compile-object-run.h b/gdb/compile/compile-object-run.h index 0124095..f8c1ef4 100644 --- a/gdb/compile/compile-object-run.h +++ b/gdb/compile/compile-object-run.h @@ -14,11 +14,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 GDB_COMPILE_OBJECT_RUN_H -#define GDB_COMPILE_OBJECT_RUN_H +#ifndef COMPILE_COMPILE_OBJECT_RUN_H +#define COMPILE_COMPILE_OBJECT_RUN_H #include "compile-object-load.h" extern void compile_object_run (struct compile_module *module); -#endif /* GDB_COMPILE_OBJECT_RUN_H */ +#endif /* COMPILE_COMPILE_OBJECT_RUN_H */ diff --git a/gdb/compile/compile.h b/gdb/compile/compile.h index 88bd8d8..127d867 100644 --- a/gdb/compile/compile.h +++ b/gdb/compile/compile.h @@ -15,8 +15,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 GDB_COMPILE_H -#define GDB_COMPILE_H +#ifndef COMPILE_COMPILE_H +#define COMPILE_COMPILE_H struct ui_file; struct gdbarch; @@ -106,4 +106,4 @@ extern void compile_print_value (struct value *val, void *data_voidp); /* Command element for the 'compile' command. */ extern cmd_list_element *compile_cmd_element; -#endif /* GDB_COMPILE_H */ +#endif /* COMPILE_COMPILE_H */ diff --git a/gdb/compile/gcc-c-plugin.h b/gdb/compile/gcc-c-plugin.h index 9ec78e2..12869f3 100644 --- a/gdb/compile/gcc-c-plugin.h +++ b/gdb/compile/gcc-c-plugin.h @@ -17,6 +17,9 @@ 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 COMPILE_GCC_C_PLUGIN_H +#define COMPILE_GCC_C_PLUGIN_H + #include "compile-internal.h" /* A class representing the C plug-in. */ @@ -64,3 +67,5 @@ private: /* The GCC C context. */ struct gcc_c_context *m_context; }; + +#endif /* COMPILE_GCC_C_PLUGIN_H */ diff --git a/gdb/compile/gcc-cp-plugin.h b/gdb/compile/gcc-cp-plugin.h index f7ba494..0f0d01f 100644 --- a/gdb/compile/gcc-cp-plugin.h +++ b/gdb/compile/gcc-cp-plugin.h @@ -17,6 +17,9 @@ 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 COMPILE_GCC_CP_PLUGIN_H +#define COMPILE_GCC_CP_PLUGIN_H + /* A class representing the GCC C++ plug-in. */ #include "gcc-cp-interface.h" @@ -83,3 +86,5 @@ private: /* The GCC C++ context. */ struct gcc_cp_context *m_context; }; + +#endif /* COMPILE_GCC_CP_PLUGIN_H */ |