d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove an unneeded temporary variable in two functions.

Browse Source 
There is no need to convert an intptr_t to a long just to cast it to a
(void *).

Obtained from:	CheriBSD
MFC after:	1 week
Sponsored by:	DARPA, AFRL
This commit is contained in:
Brooks Davis 2019-07-19 23:10:43 +00:00
parent b16d667545
commit 0ccd9d15a8
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libproc/proc_bkpt.c
View File

@ -102,7 +102,6 @@ proc_bkptset(struct proc_handle *phdl, uintptr_t address,
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 address,
/*
* 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 address,
/*
* 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 address,
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 address,
/*
* 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) {