Mass rename of SCNO_IN_RANGE define to SCNO_IS_VALID
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/count.c b/count.c
index 78d14ed..9405fd1 100644
--- a/count.c
+++ b/count.c
@@ -48,7 +48,7 @@
void
count_syscall(struct tcb *tcp, struct timeval *tv)
{
- if (!SCNO_IN_RANGE(tcp->scno))
+ if (!SCNO_IS_VALID(tcp->scno))
return;
if (!counts) {
diff --git a/defs.h b/defs.h
index 1cc5d0f..f641e0d 100644
--- a/defs.h
+++ b/defs.h
@@ -753,5 +753,5 @@
extern const char *const *signalent;
extern unsigned nsignals;
-#define SCNO_IN_RANGE(scno) \
+#define SCNO_IS_VALID(scno) \
((unsigned long)(scno) < nsyscalls && sysent[scno].sys_func)
diff --git a/pathtrace.c b/pathtrace.c
index 12e47e9..1a7d1db 100644
--- a/pathtrace.c
+++ b/pathtrace.c
@@ -162,7 +162,7 @@
if (selected[0] == NULL)
return 1;
- if (!SCNO_IN_RANGE(tcp->scno))
+ if (!SCNO_IS_VALID(tcp->scno))
return 0;
s = &sysent[tcp->scno];
diff --git a/syscall.c b/syscall.c
index 1ffb3fc..6078cb7 100644
--- a/syscall.c
+++ b/syscall.c
@@ -1281,7 +1281,7 @@
mips_r2 = regs[REG_V0];
scno = mips_r2;
- if (!SCNO_IN_RANGE(scno)) {
+ if (!SCNO_IS_VALID(scno)) {
if (mips_a3 == 0 || mips_a3 == -1) {
if (debug_flag)
fprintf(stderr, "stray syscall exit: v0 = %ld\n", scno);
@@ -1294,7 +1294,7 @@
if (upeek(tcp, REG_V0, &scno) < 0)
return -1;
- if (!SCNO_IN_RANGE(scno)) {
+ if (!SCNO_IS_VALID(scno)) {
if (mips_a3 == 0 || mips_a3 == -1) {
if (debug_flag)
fprintf(stderr, "stray syscall exit: v0 = %ld\n", scno);
@@ -1311,7 +1311,7 @@
* Do some sanity checks to figure out if it's
* really a syscall entry
*/
- if (!SCNO_IN_RANGE(scno)) {
+ if (!SCNO_IS_VALID(scno)) {
if (alpha_a3 == 0 || alpha_a3 == -1) {
if (debug_flag)
fprintf(stderr, "stray syscall exit: r0 = %ld\n", scno);
@@ -1579,7 +1579,7 @@
*/
int (*func)();
- if (!SCNO_IN_RANGE(tcp->scno))
+ if (!SCNO_IS_VALID(tcp->scno))
return;
func = sysent[tcp->scno].sys_func;
@@ -1610,7 +1610,7 @@
{
int i, nargs;
- if (SCNO_IN_RANGE(tcp->scno))
+ if (SCNO_IS_VALID(tcp->scno))
nargs = tcp->u_nargs = sysent[tcp->scno].nargs;
else
nargs = tcp->u_nargs = MAX_ARGS;
@@ -1850,7 +1850,7 @@
printleader(tcp);
if (scno_good != 1)
tprints("????" /* anti-trigraph gap */ "(");
- else if (!SCNO_IN_RANGE(tcp->scno))
+ else if (!SCNO_IS_VALID(tcp->scno))
tprintf("syscall_%lu(", tcp->scno);
else
tprintf("%s(", sysent[tcp->scno].sys_name);
@@ -1862,7 +1862,7 @@
}
#if defined(SYS_socket_subcall) || defined(SYS_ipc_subcall)
- while (SCNO_IN_RANGE(tcp->scno)) {
+ while (SCNO_IS_VALID(tcp->scno)) {
# ifdef SYS_socket_subcall
if (sysent[tcp->scno].sys_func == sys_socketcall) {
decode_socket_subcall(tcp);
@@ -1882,7 +1882,7 @@
if (need_fork_exec_workarounds)
syscall_fixup_for_fork_exec(tcp);
- if ((SCNO_IN_RANGE(tcp->scno) &&
+ if ((SCNO_IS_VALID(tcp->scno) &&
!(qual_flags[tcp->scno] & QUAL_TRACE)) ||
(tracing_paths && !pathtrace_match(tcp))) {
tcp->flags |= TCB_INSYSCALL | TCB_FILTERED;
@@ -1897,11 +1897,11 @@
}
printleader(tcp);
- if (!SCNO_IN_RANGE(tcp->scno))
+ if (!SCNO_IS_VALID(tcp->scno))
tprintf("syscall_%lu(", tcp->scno);
else
tprintf("%s(", sysent[tcp->scno].sys_name);
- if (!SCNO_IN_RANGE(tcp->scno) ||
+ if (!SCNO_IS_VALID(tcp->scno) ||
((qual_flags[tcp->scno] & QUAL_RAW) &&
sysent[tcp->scno].sys_func != sys_exit))
res = printargs(tcp);
@@ -2078,8 +2078,9 @@
{
int u_error = 0;
int check_errno = 1;
- if (SCNO_IN_RANGE(tcp->scno) &&
- sysent[tcp->scno].sys_flags & SYSCALL_NEVER_FAILS) {
+ if (SCNO_IS_VALID(tcp->scno)
+ && (sysent[tcp->scno].sys_flags & SYSCALL_NEVER_FAILS)
+ ) {
check_errno = 0;
}
#if defined(S390) || defined(S390X)
@@ -2313,7 +2314,7 @@
return;
if (tcp->u_arg[0] < 0 || tcp->u_arg[0] >= MAX_QUALS)
return;
- if (!SCNO_IN_RANGE(tcp->scno))
+ if (!SCNO_IS_VALID(tcp->scno))
return;
if (sysent[tcp->scno].sys_func == printargs)
return;
@@ -2387,7 +2388,7 @@
if ((followfork < 2 && printing_tcp != tcp) || (tcp->flags & TCB_REPRINT)) {
tcp->flags &= ~TCB_REPRINT;
printleader(tcp);
- if (!SCNO_IN_RANGE(tcp->scno))
+ if (!SCNO_IS_VALID(tcp->scno))
tprintf("<... syscall_%lu resumed> ", tcp->scno);
else
tprintf("<... %s resumed> ", sysent[tcp->scno].sys_name);
@@ -2405,7 +2406,7 @@
}
sys_res = 0;
- if (!SCNO_IN_RANGE(tcp->scno)
+ if (!SCNO_IS_VALID(tcp->scno)
|| (qual_flags[tcp->scno] & QUAL_RAW)) {
/* sys_res = printargs(tcp); - but it's nop on sysexit */
} else {
@@ -2425,7 +2426,7 @@
tprints(") ");
tabto();
u_error = tcp->u_error;
- if (!SCNO_IN_RANGE(tcp->scno) ||
+ if (!SCNO_IS_VALID(tcp->scno) ||
qual_flags[tcp->scno] & QUAL_RAW) {
if (u_error)
tprintf("= -1 (errno %ld)", u_error);