This is a simple bug. target_disable_btrace and target_teardown_btrace,

both from gdb/target.c, do a "return" calling another function.  But both
are marked as void.  Despite the fact that the functions being called are
void as well, this is wrong.  This patch fixes this by calling the functions
and then returning in the next line.

2013-10-16  Sergio Durigan Junior  <sergiodj@redhat.com>

	PR gdb/16042
	* target.c (target_disable_btrace): Fix invalid return value for
	void function.
	(target_teardown_btrace): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index da2c84df6d57953c49441c46e3f05588f1ee6025..b2f1fc8dfacb120f6ac93a0344f9f7cdada78304 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-16  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+       PR gdb/16042
+       * target.c (target_disable_btrace): Fix invalid return value for
+       void function.
+       (target_teardown_btrace): Likewise.
+
 2013-10-14  Yao Qi  <yao@codesourcery.com>
 
        * varobj.c (struct varobj): Move most of the fields to

diff --git a/gdb/target.c b/gdb/target.c
index 72793597571749110ed7fefe189fe216fa53d654..22d7fb638f8f748e18ccc2e4b4308877bc008b82 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -4165,7 +4165,10 @@ target_disable_btrace (struct btrace_target_info *btinfo)
 
   for (t = current_target.beneath; t != NULL; t = t->beneath)
     if (t->to_disable_btrace != NULL)
-      return t->to_disable_btrace (btinfo);
+      {
+       t->to_disable_btrace (btinfo);
+       return;
+      }
 
   tcomplain ();
 }
@@ -4179,7 +4182,10 @@ target_teardown_btrace (struct btrace_target_info *btinfo)
 
   for (t = current_target.beneath; t != NULL; t = t->beneath)
     if (t->to_teardown_btrace != NULL)
-      return t->to_teardown_btrace (btinfo);
+      {
+       t->to_teardown_btrace (btinfo);
+       return;
+      }
 
   tcomplain ();
 }