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

Fix style bugs and remove trailing whitespace in libproc and librtld_db.

Browse Source 
MFC after:	1 week
This commit is contained in:
Mark Johnston 2016-12-06 04:13:02 +00:00
parent a2e802b76b
commit fcf9fc109e
9 changed files with 164 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libproc/_libproc.h
View File

@ -26,6 +26,9 @@
* $FreeBSD$
*/
#ifndef __LIBPROC_H_
#define __LIBPROC_H_
#include <sys/types.h>
#include <sys/ptrace.h>
@ -58,3 +61,5 @@ struct proc_handle {
#define DPRINTF(...) do { } while (0)
#define DPRINTFX(...) do { } while (0)
#endif
#endif /* __LIBPROC_H_ */

2
lib/libproc/libproc.h
View File

@ -158,4 +158,4 @@ int proc_regset(struct proc_handle *, proc_reg_t, unsigned long);
__END_DECLS
#endif /* !_LIBPROC_H_ */
#endif /* _LIBPROC_H_ */

16
lib/libproc/proc_bkpt.c
View File

@ -1,4 +1,4 @@
/*
/*-
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
@ -33,13 +33,13 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
#include <machine/_inttypes.h>
#include <assert.h>
#include <err.h>
#include <errno.h>
#include <signal.h>
#include <stdio.h>
#include "_libproc.h"
#if defined(__aarch64__)
@ -130,8 +130,8 @@ proc_bkptset(struct proc_handle *phdl, uintptr_t address,
piod.piod_addr = &instr;
piod.piod_len = BREAKPOINT_INSTR_SZ;
if (ptrace(PT_IO, proc_getpid(phdl), (caddr_t)&piod, 0) < 0) {
DPRINTF("ERROR: couldn't read instruction at address 0x%"
PRIuPTR, address);
DPRINTF("ERROR: couldn't read instruction at address 0x%jx",
(uintmax_t)address);
ret = -1;
goto done;
}
@ -146,8 +146,8 @@ proc_bkptset(struct proc_handle *phdl, uintptr_t address,
piod.piod_addr = &instr;
piod.piod_len = BREAKPOINT_INSTR_SZ;
if (ptrace(PT_IO, proc_getpid(phdl), (caddr_t)&piod, 0) < 0) {
DPRINTF("ERROR: couldn't write instruction at address 0x%"
PRIuPTR, address);
DPRINTF("ERROR: couldn't write instruction at address 0x%jx",
(uintmax_t)address);
ret = -1;
goto done;
}
@ -194,8 +194,8 @@ proc_bkptdel(struct proc_handle *phdl, uintptr_t address,
piod.piod_addr = &instr;
piod.piod_len = BREAKPOINT_INSTR_SZ;
if (ptrace(PT_IO, proc_getpid(phdl), (caddr_t)&piod, 0) < 0) {
DPRINTF("ERROR: couldn't write instruction at address 0x%"
PRIuPTR, address);
DPRINTF("ERROR: couldn't write instruction at address 0x%jx",
(uintmax_t)address);
ret = -1;
}

5
lib/libproc/proc_create.c
View File

@ -22,10 +22,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/user.h>

3
lib/libproc/proc_regs.c
View File

@ -1,4 +1,4 @@
/*
/*-
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include "_libproc.h"
int

4
lib/libproc/proc_rtld.c
View File

@ -1,4 +1,4 @@
/*
/*-
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <stdlib.h>
#include <rtld_db.h>
#include "libproc.h"
#include "_libproc.h"
static int

13
lib/libproc/proc_util.c
View File

@ -26,18 +26,21 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
#include <err.h>
#include <errno.h>
#include <signal.h>
#include <string.h>
#include <unistd.h>
#include "_libproc.h"
int
@ -58,13 +61,15 @@ proc_clearflags(struct proc_handle *phdl, int mask)
int
proc_continue(struct proc_handle *phdl)
{
int pending = 0;
int pending;
if (phdl == NULL)
return (-1);
if (phdl->status == PS_STOP && WSTOPSIG(phdl->wstat) != SIGTRAP)
pending = WSTOPSIG(phdl->wstat);
else
pending = 0;
if (ptrace(PT_CONTINUE, phdl->pid, (caddr_t)(uintptr_t)1, pending) != 0)
return (-1);
@ -104,7 +109,7 @@ proc_getflags(struct proc_handle *phdl)
if (phdl == NULL)
return (-1);
return(phdl->flags);
return (phdl->flags);
}
int

3
lib/librtld_db/rtld_db.c
View File

@ -1,4 +1,4 @@
/*
/*-
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
@ -31,7 +31,6 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
#include <sys/user.h>

2
lib/librtld_db/rtld_db.h
View File

@ -1,4 +1,4 @@
/*
/*-
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*