[asterisk-commits] mmichelson: branch mmichelson/digit_manipulation r198563 - in /team/mmichelso...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Jun  1 10:49:55 2009
New Revision: 198563

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198563
Log:
Constify the connected_info param in ast_channel_connected_line_macro.

Per Russell's review.


Modified:
    team/mmichelson/digit_manipulation/include/asterisk/channel.h
    team/mmichelson/digit_manipulation/main/channel.c

Modified: team/mmichelson/digit_manipulation/include/asterisk/channel.h
URL: http://svn.asterisk.org/svn-view/asterisk/team/mmichelson/digit_manipulation/include/asterisk/channel.h?view=diff&rev=198563&r1=198562&r2=198563
==============================================================================
--- team/mmichelson/digit_manipulation/include/asterisk/channel.h (original)
+++ team/mmichelson/digit_manipulation/include/asterisk/channel.h Mon Jun  1 10:49:55 2009
@@ -2569,7 +2569,7 @@
  * \todo Have multiple return codes based on the MACRO_RESULT
  * \todo Make constants so that caller and frame can be more expressive than just '1' and '0'
  */
-int ast_channel_connected_line_macro(struct ast_channel *autoservice_chan, struct ast_channel *macro_chan, void *connected_info, int caller, int frame);
+int ast_channel_connected_line_macro(struct ast_channel *autoservice_chan, struct ast_channel *macro_chan, const void *connected_info, int caller, int frame);
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

Modified: team/mmichelson/digit_manipulation/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/mmichelson/digit_manipulation/main/channel.c?view=diff&rev=198563&r1=198562&r2=198563
==============================================================================
--- team/mmichelson/digit_manipulation/main/channel.c (original)
+++ team/mmichelson/digit_manipulation/main/channel.c Mon Jun  1 10:49:55 2009
@@ -6510,13 +6510,13 @@
 	ast_queue_control_data(chan, AST_CONTROL_REDIRECTING, data, datalen);
 }
 
-int ast_channel_connected_line_macro(struct ast_channel *autoservice_chan, struct ast_channel *macro_chan, void *connected_info, int caller, int frame)
+int ast_channel_connected_line_macro(struct ast_channel *autoservice_chan, struct ast_channel *macro_chan, const void *connected_info, int caller, int frame)
 {
 	const char *macro;
 	const char *macro_args;
 	union {
-		struct ast_frame *frame;
-		struct ast_party_connected_line *connected;
+		const struct ast_frame *frame;
+		const struct ast_party_connected_line *connected;
 	} pointer;
 	int retval;