aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2011-06-03 19:57:03 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2011-06-03 19:57:03 +0000
commit3abc32f081747b834820a7b634f99eace12e1c56 (patch)
tree3e82437327082d646e5b0a3d352e16ceb215c574 /include
parent0424cbba6e9dce8dd6d247a1ad13b125ca513b41 (diff)
Merged revisions 321812-321813 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r321812 | rmudgett | 2011-06-03 14:55:21 -0500 (Fri, 03 Jun 2011) | 1 line Correct IAX2 and SIP event subscription description string. ........ r321813 | rmudgett | 2011-06-03 14:56:09 -0500 (Fri, 03 Jun 2011) | 1 line Constify subscription description parameter string. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@321814 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/event.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asterisk/event.h b/include/asterisk/event.h
index 9ad3a7082..73f121c97 100644
--- a/include/asterisk/event.h
+++ b/include/asterisk/event.h
@@ -114,7 +114,7 @@ typedef void (*ast_event_cb_t)(const struct ast_event *event, void *userdata);
* \note A NULL description will cause this function to crash, so watch out!
*/
struct ast_event_sub *ast_event_subscribe(enum ast_event_type event_type,
- ast_event_cb_t cb, char *description, void *userdata, ...);
+ ast_event_cb_t cb, const char *description, void *userdata, ...);
/*!
* \brief Allocate a subscription, but do not activate it
@@ -397,8 +397,7 @@ int ast_event_queue(struct ast_event *event);
* The event API already knows which events can be cached and how to cache them.
*
* \retval 0 success
- * \retval non-zero failure. If failure is returned, the event must be destroyed
- * by the caller of this function.
+ * \retval non-zero failure.
*/
int ast_event_queue_and_cache(struct ast_event *event);