svn commit: r350475 - stable/12/lib/libproc

[Brooks Davis]

Author: brooks
Date: Wed Jul 31 18:25:52 2019
New Revision: 350475
URL: https://svnweb.freebsd.org/changeset/base/350475

Log:
  MFC r350158:
  
  Remove an unneeded temporary variable in two functions.
  
  There is no need to convert an intptr_t to a long just to cast it to a
  (void *).
  
  Obtained from:	CheriBSD
  Sponsored by:	DARPA, AFRL

Modified:
  stable/12/lib/libproc/proc_bkpt.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/lib/libproc/proc_bkpt.c
==============================================================================
--- stable/12/lib/libproc/proc_bkpt.c	Wed Jul 31 18:10:50 2019	(r350474)
+++ stable/12/lib/libproc/proc_bkpt.c	Wed Jul 31 18:25:52 2019	(r350475)
@@ -102,7 +102,6 @@ proc_bkptset(struct proc_handle *phdl, uintptr_t addre
     unsigned long *saved)
 {
 	struct ptrace_io_desc piod;
-	unsigned long caddr;
 	int ret = 0, stopped;
 	instr_t instr;
 
@@ -125,10 +124,9 @@ proc_bkptset(struct proc_handle *phdl, uintptr_t addre
 	/*
 	 * Read the original instruction.
 	 */
-	caddr = address;
 	instr = 0;
 	piod.piod_op = PIOD_READ_I;
-	piod.piod_offs = (void *)caddr;
+	piod.piod_offs = (void *)address;
 	piod.piod_addr = &instr;
 	piod.piod_len  = BREAKPOINT_INSTR_SZ;
 	if (ptrace(PT_IO, proc_getpid(phdl), (caddr_t)&piod, 0) < 0) {
@@ -141,10 +139,9 @@ proc_bkptset(struct proc_handle *phdl, uintptr_t addre
 	/*
 	 * Write a breakpoint instruction to that address.
 	 */
-	caddr = address;
 	instr = BREAKPOINT_INSTR;
 	piod.piod_op = PIOD_WRITE_I;
-	piod.piod_offs = (void *)caddr;
+	piod.piod_offs = (void *)address;
 	piod.piod_addr = &instr;
 	piod.piod_len  = BREAKPOINT_INSTR_SZ;
 	if (ptrace(PT_IO, proc_getpid(phdl), (caddr_t)&piod, 0) < 0) {
@@ -167,7 +164,6 @@ proc_bkptdel(struct proc_handle *phdl, uintptr_t addre
     unsigned long saved)
 {
 	struct ptrace_io_desc piod;
-	unsigned long caddr;
 	int ret = 0, stopped;
 	instr_t instr;
 
@@ -189,10 +185,9 @@ proc_bkptdel(struct proc_handle *phdl, uintptr_t addre
 	/*
 	 * Overwrite the breakpoint instruction that we setup previously.
 	 */
-	caddr = address;
 	instr = saved;
 	piod.piod_op = PIOD_WRITE_I;
-	piod.piod_offs = (void *)caddr;
+	piod.piod_offs = (void *)address;
 	piod.piod_addr = &instr;
 	piod.piod_len  = BREAKPOINT_INSTR_SZ;
 	if (ptrace(PT_IO, proc_getpid(phdl), (caddr_t)&piod, 0) < 0) {