diff options
| -rw-r--r-- | channels/chan_iax2.c | 5 | ||||
| -rw-r--r-- | channels/chan_sip.c | 4 | ||||
| -rw-r--r-- | include/asterisk/event.h | 5 | ||||
| -rw-r--r-- | main/event.c | 2 |
4 files changed, 5 insertions, 11 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index a4ef63734..0802474ee 100644 --- 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 a4f2febc1..f4fe16a9b 100644 --- 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 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); diff --git a/main/event.c b/main/event.c index 4f8b08bb2..a50f611ed 100644 --- 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; |