From: Kevin P. Fleming <kpfleming@digium.com>
Date: Tue, 13 Dec 2005 16:07:19 +0000 (+0000)
Subject: Merged revisions 7468 via svnmerge from
X-Git-Tag: 1.4.0-beta1~3195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ca9632df5cf67a53bdaed588313aeec48cc3491;p=thirdparty%2Fasterisk.git

Merged revisions 7468 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7468 | kpfleming | 2005-12-13 10:06:27 -0600 (Tue, 13 Dec 2005) | 2 lines

correct broken math in tvfix() for timestamp values over one million

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/utils.c b/utils.c
index 89fc262117..f104410503 100644
--- a/utils.c
+++ b/utils.c
@@ -613,11 +613,11 @@ static struct timeval tvfix(struct timeval a)
 	if (a.tv_usec >= ONE_MILLION) {
 		ast_log(LOG_WARNING, "warning too large timestamp %ld.%ld\n",
 			a.tv_sec, (long int) a.tv_usec);
-		a.tv_sec += a.tv_usec % ONE_MILLION;
+		a.tv_sec += a.tv_usec / ONE_MILLION;
 		a.tv_usec %= ONE_MILLION;
 	} else if (a.tv_usec < 0) {
 		ast_log(LOG_WARNING, "warning negative timestamp %ld.%ld\n",
-				a.tv_sec, (long int) a.tv_usec);
+			a.tv_sec, (long int) a.tv_usec);
 		a.tv_usec = 0;
 	}
 	return a;