[svn-commits] tilghman: branch 1.6.0 r131984 - in /branches/1.6.0: ./ channels/ include/ast...

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jul 18 11:36:39 2008
New Revision: 131984

URL: http://svn.digium.com/view/asterisk?view=rev&rev=131984
Log:
Merged revisions 131982 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r131982 | tilghman | 2008-07-18 11:33:56 -0500 (Fri, 18 Jul 2008) | 10 lines

Merged revisions 131970 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r131970 | tilghman | 2008-07-18 11:30:31 -0500 (Fri, 18 Jul 2008) | 2 lines

Make the ast_assert call within ast_sched_del report something useful.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c
    branches/1.6.0/include/asterisk/sched.h
    branches/1.6.0/main/sched.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=131984&r1=131983&r2=131984
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Fri Jul 18 11:36:39 2008
@@ -1195,8 +1195,8 @@
 			/* I am the schedule, so I'm allowed to do this */
 			iaxs[callno]->lagid = -1;
 		}
-	} else if (option_debug > 0) {
-		ast_log(LOG_DEBUG, "I was supposed to send a LAGRQ with callno %d, but no such call exists (and I cannot remove lagid, either).\n", callno);
+	} else {
+		ast_log(LOG_WARNING, "I was supposed to send a LAGRQ with callno %d, but no such call exists (and I cannot remove lagid, either).\n", callno);
 	}
 
 	ast_mutex_unlock(&iaxsl[callno]);

Modified: branches/1.6.0/include/asterisk/sched.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/sched.h?view=diff&rev=131984&r1=131983&r2=131984
==============================================================================
--- branches/1.6.0/include/asterisk/sched.h (original)
+++ branches/1.6.0/include/asterisk/sched.h Fri Jul 18 11:36:39 2008
@@ -158,7 +158,8 @@
  * \param id ID of the scheduled item to delete
  * \return Returns 0 on success, -1 on failure
  */
-int ast_sched_del(struct sched_context *con, int id);
+int _ast_sched_del(struct sched_context *con, int id, const char *file, int line, const char *function);
+#define	ast_sched_del(a, b)	_ast_sched_del(a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__)
 
 /*! \brief Determines number of seconds until the next outstanding event to take place
  * Determine the number of seconds until the next outstanding event

Modified: branches/1.6.0/main/sched.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/sched.c?view=diff&rev=131984&r1=131983&r2=131984
==============================================================================
--- branches/1.6.0/main/sched.c (original)
+++ branches/1.6.0/main/sched.c Fri Jul 18 11:36:39 2008
@@ -263,7 +263,7 @@
  * would be two or more in the list with that
  * id.
  */
-int ast_sched_del(struct sched_context *con, int id)
+int _ast_sched_del(struct sched_context *con, int id, const char *file, int line, const char *function)
 {
 	struct sched *s;
 
@@ -289,7 +289,7 @@
 
 	if (!s) {
 		ast_debug(1, "Attempted to delete nonexistent schedule entry %d!\n", id);
-		ast_assert(s != NULL);
+		_ast_assert(0, "s != NULL", file, line, function);
 		return -1;
 	}