glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move umoven_or_printaddr_ignore_syserror to util.c

Browse Source 
* defs.h (umoven_or_printaddr_ignore_syserror): New prototype.
* v4l2.c (umoven_or_printaddr_ignore_syserror): Move ...
* util.c: ... here.
This commit is contained in:
Eugene Syromyatnikov 2016-10-15 02:27:21 +03:00 committed by Dmitry V. Levin
parent b0c4a35ac1
commit a980c9ebbd
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defs.h
View File

@ -478,6 +478,9 @@ extern int umoven(struct tcb *, long, unsigned int, void *);
extern int umoven_or_printaddr(struct tcb *, long, unsigned int, void *);
#define umove_or_printaddr(pid, addr, objp) \
umoven_or_printaddr((pid), (addr), sizeof(*(objp)), (void *) (objp))
extern int
umoven_or_printaddr_ignore_syserror(struct tcb *tcp, const long addr,
const unsigned int len, void *our_addr);
extern int umovestr(struct tcb *, long, unsigned int, char *);
extern int upeek(int pid, long, long *);

11
util.c
View File

@ -1156,6 +1156,17 @@ umoven_or_printaddr(struct tcb *tcp, const long addr, const unsigned int len,
return 0;
}
int
umoven_or_printaddr_ignore_syserror(struct tcb *tcp, const long addr,
const unsigned int len, void *our_addr)
{
if (!addr || !verbose(tcp) || umoven(tcp, addr, len, our_addr) < 0) {
printaddr(addr);
return -1;
}
return 0;
}
/*
* Like `umove' but make the additional effort of looking
* for a terminating zero byte.

11
v4l2.c
View File

@ -675,17 +675,6 @@ print_v4l2_ext_control(struct tcb *tcp, void *elem_buf, size_t elem_size, void *
#include "xlat/v4l2_control_classes.h"
static int
umoven_or_printaddr_ignore_syserror(struct tcb *tcp, const long addr,
const unsigned int len, void *our_addr)
{
if (!addr || !verbose(tcp) || umoven(tcp, addr, len, our_addr) < 0) {
printaddr(addr);
return -1;
}
return 0;
}
static int
print_v4l2_ext_controls(struct tcb *tcp, const long arg, const bool is_get)
{