[Asterisk-cvs] asterisk sched.c,1.13,1.14

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory localhost.localdomain:/tmp/cvs-serv17685

Modified Files:
	sched.c 
Log Message:
Minor scheduling fixups


Index: sched.c
===================================================================
RCS file: /usr/cvsroot/asterisk/sched.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- sched.c	22 Jun 2004 18:48:59 -0000	1.13
+++ sched.c	20 Jul 2004 13:43:33 -0000	1.14
@@ -201,7 +201,7 @@
 		return -1;
 	}
 	/*ast_log(LOG_DEBUG, "TV -> %lu,%lu\n", tv->tv_sec, tv->tv_usec);*/
-	if (((unsigned long)(tv->tv_sec) > 0)&&((unsigned long)(tv->tv_usec) > 0)) {
+	if (((unsigned long)(tv->tv_sec) > 0)||((unsigned long)(tv->tv_usec) > 0)) {
 		if ((unsigned long)(tv_tmp.tv_usec) < (unsigned long)(tv->tv_usec)) {
 			tv_tmp.tv_usec += 1000000;
 			tv_tmp.tv_sec -= 1;
@@ -218,7 +218,7 @@
 		tv->tv_sec = tv_tmp.tv_sec + (when/1000 - error_sec);
 		tv->tv_usec = tv_tmp.tv_usec + ((when % 1000) * 1000 - error_usec);
 	} else {
-		ast_log(LOG_NOTICE, "Request to schedule in the past?!?!\n");
+		ast_log(LOG_DEBUG, "Request to schedule in the past?!?!\n");
 		tv->tv_sec = tv_tmp.tv_sec;
 		tv->tv_usec = tv_tmp.tv_usec;
 	}