From 20f796c9700ce22f0bf596ddf435bc6b48efbc15 Mon Sep 17 00:00:00 2001
From: Gary Benson <gbenson@redhat.com>
Date: Mon, 30 Mar 2015 14:58:33 +0100
Subject: [PATCH] Remove three redundant wrapper functions in remote.c
gdb/ChangeLog:
* remote.c (remote_mourn_1): Remove function. Update all callers
to use remote_mourn.
(extended_remote_mourn_1): Remove function. Update all callers
to use extended_remote_mourn.
(extended_remote_attach_1): Remove function. Update all callers
to use extended_remote_attach.
---
gdb/ChangeLog | 9 +++++++++
gdb/remote.c | 33 ++++++---------------------------
2 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fe6811eea07..651383f5a28 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2015-03-30 Gary Benson <gbenson@redhat.com>
+
+ * remote.c (remote_mourn_1): Remove function. Update all callers
+ to use remote_mourn.
+ (extended_remote_mourn_1): Remove function. Update all callers
+ to use extended_remote_mourn.
+ (extended_remote_attach_1): Remove function. Update all callers
+ to use extended_remote_attach.
+
2015-03-28 James Bowman <james.bowman@ftdichip.com>
* Makefile.in (ALL_TARGET_OBS): Add ft32-tdep.o.
diff --git a/gdb/remote.c b/gdb/remote.c
index 31c933b3fac..131ebf1a702 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -110,8 +110,6 @@ static void extended_remote_restart (void);
static void extended_remote_mourn (struct target_ops *);
-static void remote_mourn_1 (struct target_ops *);
-
static void remote_send (char **buf, long *sizeof_buf_p);
static int readchar (int timeout);
@@ -4471,9 +4469,9 @@ remote_disconnect (struct target_ops *target, const char *args, int from_tty)
error (_("Argument given to \"disconnect\" when remotely debugging."));
/* Make sure we unpush even the extended remote targets; mourn
- won't do it. So call remote_mourn_1 directly instead of
+ won't do it. So call remote_mourn directly instead of
target_mourn_inferior. */
- remote_mourn_1 (target);
+ remote_mourn (target);
if (from_tty)
puts_filtered ("Ending remote debugging.\n");
@@ -4483,8 +4481,8 @@ remote_disconnect (struct target_ops *target, const char *args, int from_tty)
be chatty about it. */
static void
-extended_remote_attach_1 (struct target_ops *target, const char *args,
- int from_tty)
+extended_remote_attach (struct target_ops *target, const char *args,
+ int from_tty)
{
struct remote_state *rs = get_remote_state ();
int pid;
@@ -4596,12 +4594,6 @@ extended_remote_attach_1 (struct target_ops *target, const char *args,
gdb_assert (wait_status == NULL);
}
-static void
-extended_remote_attach (struct target_ops *ops, const char *args, int from_tty)
-{
- extended_remote_attach_1 (ops, args, from_tty);
-}
-
/* Implementation of the to_post_attach method. */
static void
@@ -7920,14 +7912,7 @@ extended_remote_kill (struct target_ops *ops)
}
static void
-remote_mourn (struct target_ops *ops)
-{
- remote_mourn_1 (ops);
-}
-
-/* Worker function for remote_mourn. */
-static void
-remote_mourn_1 (struct target_ops *target)
+remote_mourn (struct target_ops *target)
{
unpush_target (target);
@@ -7936,7 +7921,7 @@ remote_mourn_1 (struct target_ops *target)
}
static void
-extended_remote_mourn_1 (struct target_ops *target)
+extended_remote_mourn (struct target_ops *target)
{
struct remote_state *rs = get_remote_state ();
@@ -7996,12 +7981,6 @@ extended_remote_mourn_1 (struct target_ops *target)
}
}
-static void
-extended_remote_mourn (struct target_ops *ops)
-{
- extended_remote_mourn_1 (ops);
-}
-
static int
extended_remote_supports_disable_randomization (struct target_ops *self)
{