[asterisk-commits] rmudgett: trunk r328344 - in /trunk: ./ apps/ channels/ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jul 14 19:23:14 2011
New Revision: 328344

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=328344
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c
    trunk/channels/chan_sip.c
    trunk/channels/chan_skinny.c
    trunk/include/asterisk/extconf.h
    trunk/include/asterisk/pbx.h
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.10-merged (original)
+++ branch-1.10-merged Thu Jul 14 19:23:14 2011
@@ -1,1 +1,1 @@
-/branches/1.10:1-328075,328120,328162,328207,328247,328317
+/branches/1.10:1-328075,328120,328162,328207,328247,328317,328329

Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=328344&r1=328343&r2=328344
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Thu Jul 14 19:23:14 2011
@@ -1573,7 +1573,7 @@
 	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;

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=328344&r1=328343&r2=328344
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Jul 14 19:23:14 2011
@@ -1351,7 +1351,7 @@
 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 @@
 /*! \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;
 

Modified: trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=328344&r1=328343&r2=328344
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Thu Jul 14 19:23:14 2011
@@ -1423,7 +1423,7 @@
 	.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 @@
 	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;

Modified: trunk/include/asterisk/extconf.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/extconf.h?view=diff&rev=328344&r1=328343&r2=328344
==============================================================================
--- trunk/include/asterisk/extconf.h (original)
+++ trunk/include/asterisk/extconf.h Thu Jul 14 19:23:14 2011
@@ -111,7 +111,7 @@
 	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 */

Modified: trunk/include/asterisk/pbx.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/pbx.h?view=diff&rev=328344&r1=328343&r2=328344
==============================================================================
--- trunk/include/asterisk/pbx.h (original)
+++ trunk/include/asterisk/pbx.h Thu Jul 14 19:23:14 2011
@@ -76,7 +76,7 @@
 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 {

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=328344&r1=328343&r2=328344
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Thu Jul 14 19:23:14 2011
@@ -5140,7 +5140,7 @@
 	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];