Merged revisions 328329 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10 ........ r328329 | rmudgett | 2011-07-14 19:19:32 -0500 (Thu, 14 Jul 2011) | 2 lines Make hint watcher callback take const strings for context and exten parameters. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328344 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
567a2cc04c
commit
2abe989c60
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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];
|
||||
|
|
Reference in New Issue