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: https://origsvn.digium.com/svn/asterisk/trunk@321814 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index a4ef637..0802474 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1282,10 +1282,7 @@ static void network_change_event_subscribe(void)
 {
        if (!network_change_event_subscription) {
                network_change_event_subscription = ast_event_subscribe(AST_EVENT_NETWORK_CHANGE,
-                       network_change_event_cb,
-                       "SIP Network Change ",
-                       NULL,
-                       AST_EVENT_IE_END);
+                       network_change_event_cb, "IAX2 Network Change", NULL, AST_EVENT_IE_END);
        }
 }
 

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a4f2feb..f4fe16a 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -14248,9 +14248,7 @@ static void network_change_event_subscribe(void)
 {
        if (!network_change_event_subscription) {
                network_change_event_subscription = ast_event_subscribe(AST_EVENT_NETWORK_CHANGE,
-                       network_change_event_cb,
-                       "SIP Network Change ",
-                       NULL, AST_EVENT_IE_END);
+                       network_change_event_cb, "SIP Network Change", NULL, AST_EVENT_IE_END);
        }
 }
 

diff --git a/include/asterisk/event.h b/include/asterisk/event.h
index 9ad3a70..73f121c 100644 (file)
--- 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);
 

diff --git a/main/event.c b/main/event.c
index 4f8b08b..a50f611 100644 (file)
--- a/main/event.c
+++ b/main/event.c
@@ -840,7 +840,7 @@ int ast_event_sub_activate(struct ast_event_sub *sub)
 }
 
 struct ast_event_sub *ast_event_subscribe(enum ast_event_type type, ast_event_cb_t cb,
-       char *description, void *userdata, ...)
+       const char *description, void *userdata, ...)
 {
        va_list ap;
        enum ast_event_ie_type ie_type;