[asterisk-commits] trunk - r7469 in /trunk: ./ utils.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue Dec 13 10:07:19 2005
New Revision: 7469

URL: http://svn.digium.com/view/asterisk?rev=7469&view=rev
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/utils.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 13 10:07:19 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7456
+/branches/1.2:1-7468

Modified: trunk/utils.c
URL: http://svn.digium.com/view/asterisk/trunk/utils.c?rev=7469&r1=7468&r2=7469&view=diff
==============================================================================
--- trunk/utils.c (original)
+++ trunk/utils.c Tue Dec 13 10:07:19 2005
@@ -613,11 +613,11 @@
 	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;