CVS commit: src/external/bsd/libproc/dist

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Fri Sep 25 19:09:38 UTC 2015

Modified Files:
        src/external/bsd/libproc/dist: proc_bkpt.c proc_regs.c

Log Message:
remove caddr_t


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libproc/dist/proc_bkpt.c \
    src/external/bsd/libproc/dist/proc_regs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/external/bsd/libproc/dist/proc_bkpt.c
diff -u src/external/bsd/libproc/dist/proc_bkpt.c:1.3 src/external/bsd/libproc/dist/proc_bkpt.c:1.4
--- src/external/bsd/libproc/dist/proc_bkpt.c:1.3	Fri Sep 25 12:07:32 2015
+++ src/external/bsd/libproc/dist/proc_bkpt.c	Fri Sep 25 15:09:38 2015
@@ -31,7 +31,7 @@
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/lib/libproc/proc_bkpt.c 287106 2015-08-24 12:17:15Z andrew $");
 #else
-__RCSID("$NetBSD: proc_bkpt.c,v 1.3 2015/09/25 16:07:32 christos Exp $");
+__RCSID("$NetBSD: proc_bkpt.c,v 1.4 2015/09/25 19:09:38 christos Exp $");
 #endif
 
 #include <sys/types.h>
@@ -103,7 +103,7 @@ proc_bkptset(struct proc_handle *phdl, u
 	piod.piod_offs = (void *)caddr;
 	piod.piod_addr = (void *)saved->data;
 	piod.piod_len  = sizeof(saved->data);
-	if (ptrace(PT_IO, proc_getpid(phdl), (caddr_t)&piod, 0) < 0) {
+	if (ptrace(PT_IO, proc_getpid(phdl), &piod, 0) < 0) {
 		DPRINTF("ERROR: couldn't read instruction at address 0x%"
 		    PRIuPTR, address);
 		ret = -1;
@@ -117,7 +117,7 @@ proc_bkptset(struct proc_handle *phdl, u
 	piod.piod_offs = (void *)caddr;
 	piod.piod_addr = (void *)PTRACE_BREAKPOINT;
 	piod.piod_len  = sizeof(PTRACE_BREAKPOINT);
-	if (ptrace(PT_IO, proc_getpid(phdl), (caddr_t)&piod, 0) < 0) {
+	if (ptrace(PT_IO, proc_getpid(phdl), &piod, 0) < 0) {
 		DPRINTF("ERROR: couldn't write instruction at address 0x%"
 		    PRIuPTR, address);
 		ret = -1;
@@ -163,7 +163,7 @@ proc_bkptdel(struct proc_handle *phdl, u
 	piod.piod_offs = (void *)caddr;
 	piod.piod_addr = (void *)saved->data;
 	piod.piod_len  = sizeof(saved->data);
-	if (ptrace(PT_IO, proc_getpid(phdl), (caddr_t)&piod, 0) < 0) {
+	if (ptrace(PT_IO, proc_getpid(phdl), &piod, 0) < 0) {
 		DPRINTF("ERROR: couldn't write instruction at address 0x%"
 		    PRIuPTR, address);
 		ret = -1;
@@ -218,7 +218,7 @@ proc_bkptexec(struct proc_handle *phdl, 
 	 * set up by proc_bkptdel().
 	 */
 	proc_regset(phdl, REG_PC, pc);
-	if (ptrace(PT_STEP, proc_getpid(phdl), (caddr_t)1, 0) < 0) {
+	if (ptrace(PT_STEP, proc_getpid(phdl), (void *)(intptr_t)1, 0) < 0) {
 		DPRINTFX("ERROR: ptrace step failed");
 		return (-1);
 	}
Index: src/external/bsd/libproc/dist/proc_regs.c
diff -u src/external/bsd/libproc/dist/proc_regs.c:1.3 src/external/bsd/libproc/dist/proc_regs.c:1.4
--- src/external/bsd/libproc/dist/proc_regs.c:1.3	Fri Sep 25 12:07:32 2015
+++ src/external/bsd/libproc/dist/proc_regs.c	Fri Sep 25 15:09:38 2015
@@ -31,7 +31,7 @@
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/lib/libproc/proc_regs.c 285003 2015-07-01 13:59:26Z br $");
 #else
-__RCSID("$NetBSD: proc_regs.c,v 1.3 2015/09/25 16:07:32 christos Exp $");
+__RCSID("$NetBSD: proc_regs.c,v 1.4 2015/09/25 19:09:38 christos Exp $");
 #endif
 
 #include <sys/types.h>
@@ -55,7 +55,7 @@ proc_regget(struct proc_handle *phdl, pr
 		return (-1);
 	}
 	memset(&regs, 0, sizeof(regs));
-	if (ptrace(PT_GETREGS, proc_getpid(phdl), (caddr_t)&regs, 0) < 0)
+	if (ptrace(PT_GETREGS, proc_getpid(phdl), &regs, 0) < 0)
 		return (-1);
 	switch (reg) {
 	case REG_PC:
@@ -90,7 +90,7 @@ proc_regset(struct proc_handle *phdl, pr
 		errno = ENOENT;
 		return (-1);
 	}
-	if (ptrace(PT_GETREGS, proc_getpid(phdl), (caddr_t)&regs, 0) < 0)
+	if (ptrace(PT_GETREGS, proc_getpid(phdl), &regs, 0) < 0)
 		return (-1);
 	switch (reg) {
 	case REG_PC:
@@ -111,7 +111,7 @@ proc_regset(struct proc_handle *phdl, pr
 		DPRINTFX("ERROR: no support for reg number %d", reg);
 		return (-1);
 	}
-	if (ptrace(PT_SETREGS, proc_getpid(phdl), (caddr_t)&regs, 0) < 0)
+	if (ptrace(PT_SETREGS, proc_getpid(phdl), &regs, 0) < 0)
 		return (-1);
 
 	return (0);