summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tapset/ChangeLog7
-rw-r--r--tapset/aux_syscalls.stp4
2 files changed, 9 insertions, 2 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index df98fc12..3449df2e 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,4 +1,11 @@
2007-08-23 Martin Hunt <hunt@redhat.com>
+
+ * aux_syscalls.stp (_struct_compat_timeval_u): Fix
+ array reference.
+ (_struct_compat_timespec_u): Cast args to long.
+
+2007-08-23 Martin Hunt <hunt@redhat.com>
+
From Cai Fei <caifei@cn.fujitsu.com>
* aux_syscalls.stp (_waitid_opt_str): New.
(_wait4_opt_str): Just handle wait4 options.
diff --git a/tapset/aux_syscalls.stp b/tapset/aux_syscalls.stp
index 3e31ffbc..8c371a58 100644
--- a/tapset/aux_syscalls.stp
+++ b/tapset/aux_syscalls.stp
@@ -36,7 +36,7 @@ function _struct_compat_timeval_u:string(uaddr:long, n:long)
snprintf(THIS->__retvalue, MAXSTRINGLEN, "[%ld.%06ld][%ld.%.06ld]",
(long)tv[0].tv_sec, (long)tv[0].tv_usec, (long)tv[1].tv_sec, (long)tv[1].tv_usec);
else
- snprintf(THIS->__retvalue, MAXSTRINGLEN, "[%ld.%06ld]", (long)tv.tv_sec, (long)tv.tv_usec);
+ snprintf(THIS->__retvalue, MAXSTRINGLEN, "[%ld.%06ld]", (long)tv[0].tv_sec, (long)tv[0].tv_usec);
else
strlcpy (THIS->__retvalue, "UNKNOWN", MAXSTRINGLEN);
}
@@ -201,7 +201,7 @@ function _struct_compat_timespec_u:string(uaddr:long, n:long)
if (str)
len = snprintf(ptr, MAXSTRINGLEN, "[%s]", str);
else
- len = snprintf(ptr, MAXSTRINGLEN, "[%ld.%09ld]", (long)ts[i].tv_sec, ts[i].tv_nsec);
+ len = snprintf(ptr, MAXSTRINGLEN, "[%ld.%09ld]", (long)ts[i].tv_sec, (long)ts[i].tv_nsec);
ptr += len; i++;
}
}