From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 2/4] Move some declarations to source.h
Date: Tue, 13 Feb 2018 23:39:00 -0000 [thread overview]
Message-ID: <20180213233907.11259-3-tom@tromey.com> (raw)
In-Reply-To: <20180213233907.11259-1-tom@tromey.com>
I noticed a few declarations in defs.h that really could be put into
source.h. I think it's generally preferable to something out of
defs.h unless it is needed by most of the files in gdb.
2018-02-13 Tom Tromey <tom@tromey.com>
* solib.c: Include source.h.
* nto-tdep.c: Include source.h.
* mi/mi-cmd-env.c: Include source.h.
* infcmd.c: Include source.h.
* exec.c: Include source.h.
* defs.h (enum openp_flag, openp, source_full_path_of, mod_path)
(add_path, directory_switch, source_path, init_source_path): Move
declarations...
* source.h (enum openp_flag, openp, source_full_path_of, mod_path)
(add_path, directory_switch, source_path, init_source_path):
...here.
---
gdb/ChangeLog | 14 ++++++++++++++
gdb/defs.h | 27 ---------------------------
gdb/exec.c | 1 +
gdb/infcmd.c | 1 +
gdb/mi/mi-cmd-env.c | 1 +
gdb/nto-tdep.c | 1 +
gdb/solib.c | 1 +
gdb/source.h | 25 +++++++++++++++++++++++++
8 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/gdb/defs.h b/gdb/defs.h
index 70389ad745..c85bf2cf11 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -339,33 +339,6 @@ extern int build_address_symbolic (struct gdbarch *,
extern void print_address (struct gdbarch *, CORE_ADDR, struct ui_file *);
extern const char *pc_prefix (CORE_ADDR);
-/* From source.c */
-
-/* See openp function definition for their description. */
-
-enum openp_flag
-{
- OPF_TRY_CWD_FIRST = 0x01,
- OPF_SEARCH_IN_PATH = 0x02,
- OPF_RETURN_REALPATH = 0x04,
-};
-
-DEF_ENUM_FLAGS_TYPE(openp_flag, openp_flags);
-
-extern int openp (const char *, openp_flags, const char *, int, char **);
-
-extern int source_full_path_of (const char *, char **);
-
-extern void mod_path (const char *, char **);
-
-extern void add_path (const char *, char **, int);
-
-extern void directory_switch (const char *, int);
-
-extern char *source_path;
-
-extern void init_source_path (void);
-
/* From exec.c */
/* * Process memory area starting at ADDR with length SIZE. Area is
diff --git a/gdb/exec.c b/gdb/exec.c
index 15f85a278f..79baf9c5fb 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -35,6 +35,7 @@
#include "progspace.h"
#include "gdb_bfd.h"
#include "gcore.h"
+#include "source.h"
#include <fcntl.h>
#include "readline/readline.h"
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 3879df3f5a..331fd8751b 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -59,6 +59,7 @@
#include "top.h"
#include "interps.h"
#include "common/gdb_optional.h"
+#include "source.h"
/* Local functions: */
diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c
index e7c41dd7bd..2f5b803d5b 100644
--- a/gdb/mi/mi-cmd-env.c
+++ b/gdb/mi/mi-cmd-env.c
@@ -31,6 +31,7 @@
#include "ui-out.h"
#include "top.h"
#include <sys/stat.h>
+#include "source.h"
static const char path_var_name[] = "PATH";
static char *orig_path = NULL;
diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index 03b2d1e96d..30db99c759 100644
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -31,6 +31,7 @@
#include "solib-svr4.h"
#include "gdbcore.h"
#include "objfiles.h"
+#include "source.h"
#define QNX_NOTE_NAME "QNX"
#define QNX_INFO_SECT_NAME "QNX_info"
diff --git a/gdb/solib.c b/gdb/solib.c
index 46f2324c48..c732df6150 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -46,6 +46,7 @@
#include "filesystem.h"
#include "gdb_bfd.h"
#include "filestuff.h"
+#include "source.h"
/* Architecture-specific operations. */
diff --git a/gdb/source.h b/gdb/source.h
index 77fd4cdaba..a21e919b28 100644
--- a/gdb/source.h
+++ b/gdb/source.h
@@ -21,6 +21,31 @@
struct symtab;
+/* See openp function definition for their description. */
+
+enum openp_flag
+{
+ OPF_TRY_CWD_FIRST = 0x01,
+ OPF_SEARCH_IN_PATH = 0x02,
+ OPF_RETURN_REALPATH = 0x04,
+};
+
+DEF_ENUM_FLAGS_TYPE(openp_flag, openp_flags);
+
+extern int openp (const char *, openp_flags, const char *, int, char **);
+
+extern int source_full_path_of (const char *, char **);
+
+extern void mod_path (const char *, char **);
+
+extern void add_path (const char *, char **, int);
+
+extern void directory_switch (const char *, int);
+
+extern char *source_path;
+
+extern void init_source_path (void);
+
/* This function is capable of finding the absolute path to a
source file, and opening it, provided you give it a FILENAME. Both the
DIRNAME and FULLNAME are only added suggestions on where to find the file.
--
2.13.6
next prev parent reply other threads:[~2018-02-13 23:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-13 23:39 Remove a few more cleanups: solib and openp Tom Tromey
2018-02-13 23:39 ` [RFA 1/4] Return unique_xmalloc_ptr from some solib.c functions Tom Tromey
2018-02-13 23:39 ` [RFA 3/4] Change openp et al to use a unique_xmalloc_ptr Tom Tromey
2018-02-13 23:39 ` [RFA 4/4] Constify target_so_ops::bfd_open Tom Tromey
2018-02-13 23:39 ` Tom Tromey [this message]
2018-02-14 13:55 ` Remove a few more cleanups: solib and openp Pedro Alves
2018-02-14 15:03 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180213233907.11259-3-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).