Make hint watcher callback take const strings for context and exten parameters.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.10@328329 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index fdb36fed1d5d9e1aaca160e54f35953c0045c001..025c84cac9e58e515c45a0798e77e77c7efc4dcf 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1573,7 +1573,7 @@ static int extensionstate2devicestate(int state)
        return state;
 }
 
-static int extension_state_cb(char *context, char *exten, enum ast_extension_states state, void *data)
+static int extension_state_cb(const char *context, const char *exten, enum ast_extension_states state, void *data)
 {
        struct ao2_iterator miter, qiter;
        struct member *m;

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a8d24797fd55a57aced8272f313a4f93305d95be..603d869537f42a7679f7a9b027e050b1e1dd5561 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1351,7 +1351,7 @@ static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target
 static int do_magic_pickup(struct ast_channel *channel, const char *extension, const char *context);
 
 /*--- Device monitoring and Device/extension state/event handling */
-static int cb_extensionstate(char *context, char* exten, int state, void *data);
+static int cb_extensionstate(const char *context, const char *exten, enum ast_extension_states state, void *data);
 static int sip_devicestate(void *data);
 static int sip_poke_noanswer(const void *data);
 static int sip_poke_peer(struct sip_peer *peer, int force);
@@ -14346,7 +14346,7 @@ static void network_change_event_cb(const struct ast_event *event, void *userdat
 /*! \brief Callback for the devicestate notification (SUBSCRIBE) support subsystem
 \note  If you add an "hint" priority to the extension in the dial plan,
        you will get notifications on device state changes */
-static int cb_extensionstate(char *context, char* exten, int state, void *data)
+static int cb_extensionstate(const char *context, const char *exten, enum ast_extension_states state, void *data)
 {
        struct sip_pvt *p = data;
 

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 80338c7d02ea6a240e3a73156eeb38530d0309fc..38640915c03f9a5bb5cc0f998854e01547d49f05 100644 (file)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -1423,7 +1423,7 @@ static struct ast_channel_tech skinny_tech = {
        .bridge = ast_rtp_instance_bridge, 
 };
 
-static int skinny_extensionstate_cb(char *context, char* exten, int state, void *data);
+static int skinny_extensionstate_cb(const char *context, const char *exten, enum ast_extension_states state, void *data);
 static int skinny_transfer(struct skinny_subchannel *sub);
 
 static struct skinny_line *skinny_line_alloc(void)
@@ -2796,7 +2796,7 @@ static void transmit_capabilitiesreq(struct skinny_device *d)
        transmit_response(d, req);
 }
 
-static int skinny_extensionstate_cb(char *context, char *exten, int state, void *data)
+static int skinny_extensionstate_cb(const char *context, const char *exten, enum ast_extension_states state, void *data)
 {
        struct skinny_speeddial *sd = data;
        struct skinny_device *d = sd->parent;

diff --git a/include/asterisk/extconf.h b/include/asterisk/extconf.h
index a5d36ad23b70ebc8136257c67d02658521413305..1a04b01bfb51c1d62648508e2893e70fdbba8a1f 100644 (file)
--- a/include/asterisk/extconf.h
+++ b/include/asterisk/extconf.h
@@ -111,7 +111,7 @@ struct ast_exten {
        char stuff[0];
 };
 /* from pbx.h */
-typedef int (*ast_state_cb_type)(char *context, char* id, enum ast_extension_states state, void *data);
+typedef int (*ast_state_cb_type)(const char *context, const char *exten, enum ast_extension_states state, void *data);
 struct ast_timing {
        int hastime;                            /*!< If time construct exists */
        unsigned int monthmask;                 /*!< Mask for month */

diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h
index 1489ee2d6162941d8201d7111d4f3b30b719a3e2..36bc0724c77813a609fd43ce59f39b8c98a81e00 100644 (file)
--- a/include/asterisk/pbx.h
+++ b/include/asterisk/pbx.h
@@ -76,7 +76,7 @@ struct ast_ignorepat;
 struct ast_sw;
 
 /*! \brief Typedef for devicestate and hint callbacks */
-typedef int (*ast_state_cb_type)(char *context, char* id, enum ast_extension_states state, void *data);
+typedef int (*ast_state_cb_type)(const char *context, const char *exten, enum ast_extension_states state, void *data);
 
 /*! \brief Data structure associated with a custom dialplan function */
 struct ast_custom_function {

diff --git a/main/manager.c b/main/manager.c
index 98daad0843b389bd57a093741e5b05c77262776c..94782418cad3cdb0ce8b1121fe676b8abbb52cee 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -5140,7 +5140,7 @@ int ast_manager_unregister(char *action)
        return 0;
 }
 
-static int manager_state_cb(char *context, char *exten, int state, void *data)
+static int manager_state_cb(const char *context, const char *exten, enum ast_extension_states state, void *data)
 {
        /* Notify managers of change */
        char hint[512];