From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 29 Jun 2007 21:25:56 +0000 (+0000)
Subject: 2007-06-28  Dmitry V. Levin <ldv@altlinux.org>
X-Git-Tag: v4.5.18~221
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fefdd97156bb2f86c5b6596dc7e28d954516b3ed;p=strace

2007-06-28  Dmitry V. Levin <ldv@altlinux.org>

	* util.c (tv_mul): Multiply tv_usec properly.
	Patch from Cai Fei <caifei@cn.fujitsu.com>.
---

diff --git a/ChangeLog b/ChangeLog
index 3509caa5..fac78fae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-28  Dmitry V. Levin <ldv@altlinux.org>
+
+	* util.c (tv_mul): Multiply tv_usec properly.
+	Patch from Cai Fei <caifei@cn.fujitsu.com>.
+
 2007-06-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Never interrupt when the attached traced process would be left stopped.
diff --git a/util.c b/util.c
index 06162f41..1ca400f9 100644
--- a/util.c
+++ b/util.c
@@ -227,7 +227,7 @@ struct timeval *tv, *a;
 int n;
 {
 	tv->tv_usec = a->tv_usec * n;
-	tv->tv_sec = a->tv_sec * n + a->tv_usec / 1000000;
+	tv->tv_sec = a->tv_sec * n + tv->tv_usec / 1000000;
 	tv->tv_usec %= 1000000;
 }