kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 131970 via svnmerge from

Browse Source 
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.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@131982 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-07-18 16:33:56 +00:00
parent 9a08061ea3
commit 3fa9ad3d13
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_iax2.c
View File

@@ -1202,8 +1202,8 @@ static void __send_lagrq(const void *data)
/* I am the schedule, so I'm allowed to do this */ /* I am the schedule, so I'm allowed to do this */
iaxs[callno]->lagid = -1; iaxs[callno]->lagid = -1;
} }
} else if (option_debug > 0) { } else {
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); 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]); ast_mutex_unlock(&iaxsl[callno]);

3
include/asterisk/sched.h
View File

@@ -210,7 +210,8 @@ const void *ast_sched_find_data(struct sched_context *con, int id);
* \param id ID of the scheduled item to delete * \param id ID of the scheduled item to delete
* \return Returns 0 on success, -1 on failure * \return Returns 0 on success, -1 on failure
*/ */
int ast_sched_del(struct sched_context *con, int id) attribute_warn_unused_result; int _ast_sched_del(struct sched_context *con, int id, const char *file, int line, const char *function) attribute_warn_unused_result;
#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 /*! \brief Determines number of seconds until the next outstanding event to take place
* Determine the number of seconds until the next outstanding event * Determine the number of seconds until the next outstanding event

4
main/sched.c
View File

@@ -334,7 +334,7 @@ const void *ast_sched_find_data(struct sched_context *con, int id)
* would be two or more in the list with that * would be two or more in the list with that
* id. * 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, tmp; struct sched *s, tmp;
@@ -373,7 +373,7 @@ int ast_sched_del(struct sched_context *con, int id)
if (!s) { if (!s) {
ast_debug(1, "Attempted to delete nonexistent schedule entry %d!\n", id); 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; return -1;
} }