aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk/pbx.h
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-16 20:43:46 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-16 20:43:46 +0000
commit5e1dbbb4068d8b761794fbfd02d9adb2687b2740 (patch)
tree5a167c96702022ee82db6e25d50ebef659661b6f /include/asterisk/pbx.h
parent0b9086d8bbdb25af369dfc899d2617edb6bcf3c3 (diff)
(closes issue #12689)
Reported by: ys Many thanks to ys for doing the research on this problem. I didn't think it would be best to unlock the contexts and then relock them after the remove_extension2() call, so I added an extra arg to remove_extension2() and set it appropriately in each call. There were not that many. I considered forcing the code to lock the contexts before the call to remove_extension2(), but that would require a slightly greater degree of changes, especially since the find_context_locked is local to pbx.c I did a simple sanity test to make sure the code doesn't mess things up in general. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@123165 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/pbx.h')
-rw-r--r--include/asterisk/pbx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h
index 3e3669afb..87a594c59 100644
--- a/include/asterisk/pbx.h
+++ b/include/asterisk/pbx.h
@@ -600,7 +600,7 @@ int ast_context_remove_extension(const char *context, const char *extension, int
const char *registrar);
int ast_context_remove_extension2(struct ast_context *con, const char *extension,
- int priority, const char *registrar);
+ int priority, const char *registrar, int already_locked);
/*!
* \brief Add an ignorepat