[PATCH] Update the return type of gdb_ptrace to be more flexible

Kamil Rytarowski n54@gmx.com
Fri Mar 20 14:47:04 GMT 2020


Linux returns long from ptrace(2) and BSDs int.

gdb/ChangeLog:

       * amd64-bsd-nat.c (gdb_ptrace): Change return type from `int' to
       `PTRACE_TYPE_RET'.
       * i386-bsd-nat.c (gdb_ptrace): Likewise.
       * sparc-nat.c (gdb_ptrace): Likewise.
       * x86-bsd-nat.c (gdb_ptrace): Likewise.
---
 gdb/ChangeLog       | 8 ++++++++
 gdb/amd64-bsd-nat.c | 2 +-
 gdb/i386-bsd-nat.c  | 2 +-
 gdb/sparc-nat.c     | 2 +-
 gdb/x86-bsd-nat.c   | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3a16003d9d6..9853e97a472 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2020-03-20  Kamil Rytarowski  <n54@gmx.com>
+
+	* amd64-bsd-nat.c (gdb_ptrace): Change return type from `int' to
+	`PTRACE_TYPE_RET'.
+	* i386-bsd-nat.c (gdb_ptrace): Likewise.
+	* sparc-nat.c (gdb_ptrace): Likewise.
+	* x86-bsd-nat.c (gdb_ptrace): Likewise.
+
 2020-03-20  Tom Tromey  <tromey@adacore.com>

 	* ada-valprint.c (print_variant_part): Remove parameters; switch
diff --git a/gdb/amd64-bsd-nat.c b/gdb/amd64-bsd-nat.c
index 1ff044ff470..04322c70378 100644
--- a/gdb/amd64-bsd-nat.c
+++ b/gdb/amd64-bsd-nat.c
@@ -36,7 +36,7 @@
 #include "amd64-bsd-nat.h"
 

-static int
+static PTRACE_TYPE_RET
 gdb_ptrace (PTRACE_TYPE_ARG1 request, ptid_t ptid, PTRACE_TYPE_ARG3 addr,
 	    PTRACE_TYPE_ARG4 data)
 {
diff --git a/gdb/i386-bsd-nat.c b/gdb/i386-bsd-nat.c
index 3250dab737f..4e8693246c8 100644
--- a/gdb/i386-bsd-nat.c
+++ b/gdb/i386-bsd-nat.c
@@ -34,7 +34,7 @@
 #include "inf-ptrace.h"
 

-static int
+static PTRACE_TYPE_RET
 gdb_ptrace (PTRACE_TYPE_ARG1 request, ptid_t ptid, PTRACE_TYPE_ARG3 addr,
 	    PTRACE_TYPE_ARG4 data)
 {
diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index fadcfd34474..8d5bf350bdb 100644
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -78,7 +78,7 @@ typedef struct fp_status fpregset_t;
 #define PTRACE_SETFPREGS PT_SETFPREGS
 #endif

-static int
+static PTRACE_TYPE_RET
 gdb_ptrace (PTRACE_TYPE_ARG1 request, ptid_t ptid, PTRACE_TYPE_ARG3 addr)
 {
 #ifdef __NetBSD__
diff --git a/gdb/x86-bsd-nat.c b/gdb/x86-bsd-nat.c
index 9e2bea1e020..e2ebf5f2e50 100644
--- a/gdb/x86-bsd-nat.c
+++ b/gdb/x86-bsd-nat.c
@@ -33,7 +33,7 @@
 #include "inf-ptrace.h"
 

-static int
+static PTRACE_TYPE_RET
 gdb_ptrace (PTRACE_TYPE_ARG1 request, ptid_t ptid, PTRACE_TYPE_ARG3 addr)
 {
 #ifdef __NetBSD__
--
2.25.0



More information about the Gdb-patches mailing list