[05/16] gdb: un-share set_inferior_cwd declaration

Message ID 20210714045520.1623120-6-simon.marchi@polymtl.ca
State New
Headers show
Series
  • Bunch of commands related cleanups
Related show

Commit Message

Carl Love via Gdb-patches July 14, 2021, 4:55 a.m.
The declaration of set_inferior_cwd is currently shared between gdb and
gdbserver, in gdbsupport/common-inferior.h.  It doesn't need to be, as
set_inferior_cwd is not called from common code.  Only get_inferior_cwd
needs to.

The motivation for this is that a future patch will change the prototype
of set_inferior_cwd in gdb, and I don't want to change it for gdbserver
unnecessarily.  I see this as a good cleanup in any case, to reduce to
just the essential what is shared between GDB and GDBserver.

Change-Id: I3127d27d078f0503ebf5ccc6fddf14f212426a73
---
 gdb/infcmd.c                 | 5 +++--
 gdbserver/inferiors.cc       | 2 +-
 gdbserver/inferiors.h        | 4 ++++
 gdbsupport/common-inferior.h | 4 ----
 4 files changed, 8 insertions(+), 7 deletions(-)

-- 
2.32.0

Patch

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 0a5edef69824..a7b520cdd169 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -184,9 +184,10 @@  show_args_command (struct ui_file *file, int from_tty,
   deprecated_show_value_hack (file, from_tty, c, get_inferior_args ());
 }
 
-/* See gdbsupport/common-inferior.h.  */
+/* Set the inferior current working directory.  If CWD is NULL, unset
+   the directory.  */
 
-void
+static void
 set_inferior_cwd (const char *cwd)
 {
   struct inferior *inf = current_inferior ();
diff --git a/gdbserver/inferiors.cc b/gdbserver/inferiors.cc
index 3750090c0a14..0a09de79071d 100644
--- a/gdbserver/inferiors.cc
+++ b/gdbserver/inferiors.cc
@@ -241,7 +241,7 @@  get_inferior_cwd ()
   return current_inferior_cwd;
 }
 
-/* See gdbsupport/common-inferior.h.  */
+/* See inferiors.h.  */
 
 void
 set_inferior_cwd (const char *cwd)
diff --git a/gdbserver/inferiors.h b/gdbserver/inferiors.h
index 7754f745cd7d..3b8959a28cf7 100644
--- a/gdbserver/inferiors.h
+++ b/gdbserver/inferiors.h
@@ -154,4 +154,8 @@  void *thread_target_data (struct thread_info *);
 struct regcache *thread_regcache_data (struct thread_info *);
 void set_thread_regcache_data (struct thread_info *, struct regcache *);
 
+/* Set the inferior current working directory.  If CWD is NULL, unset
+   the directory.  */
+void set_inferior_cwd (const char *cwd);
+
 #endif /* GDBSERVER_INFERIORS_H */
diff --git a/gdbsupport/common-inferior.h b/gdbsupport/common-inferior.h
index 3f1b60fd9629..5e1221277b87 100644
--- a/gdbsupport/common-inferior.h
+++ b/gdbsupport/common-inferior.h
@@ -36,10 +36,6 @@  extern const char *get_exec_file (int err);
    been set, then return NULL.  */
 extern const char *get_inferior_cwd ();
 
-/* Set the inferior current working directory.  If CWD is NULL, unset
-   the directory.  */
-extern void set_inferior_cwd (const char *cwd);
-
 /* Whether to start up the debuggee under a shell.
 
    If startup-with-shell is set, GDB's "run" will attempt to start up