From 1830d00ebc02d0cf8123a39708380b01fdfda30f Mon Sep 17 00:00:00 2001 From: hunt Date: Wed, 11 Jul 2007 00:39:18 +0000 Subject: 2007-07-10 Martin Hunt * aux_syscalls.stp (_struct_compat_timeval2_u): Fixes. --- tapset/ChangeLog | 6 +++++- tapset/aux_syscalls.stp | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index e6b508be..595f40a2 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,5 +1,9 @@ 2007-07-10 Martin Hunt + * aux_syscalls.stp (_struct_compat_timeval2_u): + Fixes. + +2007-07-10 Martin Hunt * syscall*.stp: Major reorganization work. * aux_syscalls.stp (_sigprocmask_how_str): Rewrite in C so real arch-dependent header files @@ -12,7 +16,7 @@ 2007-07-09 Martin Hunt * syscalls2.stp (compat_sys_utimes): New. - * ppc64/syscalls.stp (ciompat_sys_utimes): Removed. + * ppc64/syscalls.stp (compat_sys_utimes): Removed. * syscalls.stp (compat_sys_futimesat): Fix arg. diff --git a/tapset/aux_syscalls.stp b/tapset/aux_syscalls.stp index e31c0566..e6071507 100644 --- a/tapset/aux_syscalls.stp +++ b/tapset/aux_syscalls.stp @@ -50,7 +50,7 @@ function _struct_compat_timeval_u:string(uaddr:long) function _struct_compat_timeval2_u:string(uaddr:long) %{ /* pure */ - struct timeval tv[2]; + struct compat_timeval tv[2]; char *ptr = (char *)(unsigned long)THIS->uaddr; if (ptr == NULL) @@ -58,7 +58,7 @@ function _struct_compat_timeval2_u:string(uaddr:long) else { if(_stp_copy_from_user((char*)&tv,ptr,2*sizeof(struct compat_timeval)) == 0) snprintf(THIS->__retvalue, MAXSTRINGLEN, "[%ld.%06ld][%ld.%.06ld]", - tv[0].tv_sec, tv[0].tv_usec, tv[1].tv_sec, tv[1].tv_usec); + (long)tv[0].tv_sec, (long)tv[0].tv_usec, (long)tv[1].tv_sec, (long)tv[1].tv_usec); else strlcpy (THIS->__retvalue, "UNKNOWN", MAXSTRINGLEN); } -- cgit