[asterisk-commits] tilghman: trunk r131989 - in /trunk: ./ main/sched.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jul 18 12:10:34 2008
New Revision: 131989

URL: http://svn.digium.com/view/asterisk?view=rev&rev=131989
Log:
Merged revisions 131988 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r131988 | tilghman | 2008-07-18 12:10:01 -0500 (Fri, 18 Jul 2008) | 2 lines

Oops

........

Modified:
    trunk/   (props changed)
    trunk/main/sched.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/sched.c
URL: http://svn.digium.com/view/asterisk/trunk/main/sched.c?view=diff&rev=131989&r1=131988&r2=131989
==============================================================================
--- trunk/main/sched.c (original)
+++ trunk/main/sched.c Fri Jul 18 12:10:34 2008
@@ -377,7 +377,11 @@
 
 	if (!s) {
 		ast_debug(1, "Attempted to delete nonexistent schedule entry %d!\n", id);
+#ifndef DEVMODE
+		ast_assert(s != NULL);
+#else
 		_ast_assert(0, "s != NULL", file, line, function);
+#endif
 		return -1;
 	}