summaryrefslogtreecommitdiff
path: root/times.c
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2016-12-26 02:59:36 +0000
committerDmitry V. Levin <ldv@altlinux.org>2016-12-26 10:43:35 +0000
commita1e94e9c7af845c06cd447ca12eec2641ceb4e7c (patch)
treef85c3613f3fd7bfda9fb7b9f15c0474b9995865c /times.c
parent50b50e78f674068c614e08a1b9e30971503ea61c (diff)
downloadstrace-a1e94e9c7af845c06cd447ca12eec2641ceb4e7c.tar.gz
Remove HAVE_STRUCT_TCB_EXT_ARG, ext_arg, and u_lrval
After transition from long to kernel_ulong_t these fields are no longer needed. * defs.h (HAVE_STRUCT_TCB_EXT_ARG): Remove. (struct tcb) [HAVE_STRUCT_TCB_EXT_ARG]: Remove. [HAVE_STRUCT_TCB_EXT_ARG]: Remove. (RVAL_MASK): Update. * io.c (print_lld_from_low_high_val): Check [SIZEOF_KERNEL_LONG_T > SIZEOF_LONG] instead of [HAVE_STRUCT_TCB_EXT_ARG]. Use u_arg instead of ext_arg. * linux/mips/get_error.c (get_error) [LINUX_MIPSN32]: Remove. * linux/mips/get_syscall_args.c (get_syscall_args) [LINUX_MIPSN32]: Remove. [LINUX_MIPSN64]: Extend to [LINUX_MIPSN32]. * linux/x86_64/get_error.c (get_error) [X32]: Remove. * linux/x86_64/get_syscall_args.c (get_syscall_args) [X32]: Remove. * lseek.c: Check [SIZEOF_KERNEL_LONG_T > SIZEOF_LONG] instead of [HAVE_STRUCT_TCB_EXT_ARG]. [SIZEOF_KERNEL_LONG_T > SIZEOF_LONG] (SYS_FUNC(lseek)): Use u_arg instead of ext_arg. Use RVAL_UDECIMAL instead of RVAL_LUDECIMAL. * mem.c (SYS_FUNC(mmap)): Pass offset syscall argument directly to print_mmap. * syscall.c (trace_syscall_exiting) [HAVE_STRUCT_TCB_EXT_ARG]: Remove. * times.c (SYS_FUNC(times)): Use RVAL_UDECIMAL instead of RVAL_LUDECIMAL. * util.c (getllval): Check [SIZEOF_KERNEL_LONG_T > SIZEOF_LONG] instead of [HAVE_STRUCT_TCB_EXT_ARG]. Use u_arg instead of ext_arg.
Diffstat (limited to 'times.c')
-rw-r--r--times.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/times.c b/times.c
index 6af4f95a0..b165a2b0d 100644
--- a/times.c
+++ b/times.c
@@ -53,10 +53,5 @@ SYS_FUNC(times)
zero_extend_signed_to_ull(tbuf.tms_cstime));
}
- return syserror(tcp) ? RVAL_DECIMAL :
-#if defined(RVAL_LUDECIMAL) && !defined(IN_MPERS)
- RVAL_LUDECIMAL;
-#else
- RVAL_UDECIMAL;
-#endif
+ return syserror(tcp) ? RVAL_DECIMAL : RVAL_UDECIMAL;
}