[asterisk-commits] seanbright: trunk r196227 - in /trunk: channels/ main/ res/

[SVN commits to the Asterisk project]

Author: seanbright
Date: Fri May 22 11:10:33 2009
New Revision: 196227

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196227
Log:
Fix build under dev mode and remove some casts that are no longer necessary as
a result of the const-ify the world patch.

Modified:
    trunk/channels/chan_dahdi.c
    trunk/main/pbx.c
    trunk/res/res_jabber.c
    trunk/res/res_monitor.c

Modified: trunk/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=196227&r1=196226&r2=196227
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri May 22 11:10:33 2009
@@ -3991,7 +3991,7 @@
 {
 	/* Data will be our digit string */
 	struct dahdi_pvt *p;
-	const char *digits = (const char *) data;
+	const char *digits = data;
 
 	if (ast_strlen_zero(digits)) {
 		ast_debug(1, "No digit string sent to application!\n");

Modified: trunk/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/pbx.c?view=diff&rev=196227&r1=196226&r2=196227
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Fri May 22 11:10:33 2009
@@ -942,7 +942,9 @@
 static int pbx_builtin_saycharacters(struct ast_channel *, const char *);
 static int pbx_builtin_sayphonetic(struct ast_channel *, const char *);
 static int matchcid(const char *cidpattern, const char *callerid);
+#ifdef NEED_DEBUG
 static void log_match_char_tree(struct match_char *node, char *prefix); /* for use anywhere */
+#endif
 static int pbx_builtin_importvar(struct ast_channel *, const char *);
 static void set_ext_pri(struct ast_channel *c, const char *exten, int pri);
 static void new_find_extension(const char *str, struct scoreboard *score,
@@ -1488,6 +1490,7 @@
 #endif
 }
 
+#ifdef NEED_DEBUG
 static void log_match_char_tree(struct match_char *node, char *prefix)
 {
 	char extenstr[40];
@@ -1516,6 +1519,7 @@
 	if (node->alt_char)
 		log_match_char_tree(node->alt_char, prefix);
 }
+#endif
 
 static void cli_match_char_tree(struct match_char *node, char *prefix, int fd)
 {

Modified: trunk/res/res_jabber.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/res/res_jabber.c?view=diff&rev=196227&r1=196226&r2=196227
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Fri May 22 11:10:33 2009
@@ -561,7 +561,7 @@
 
 	AST_STANDARD_APP_ARGS(args, s);
 	if (args.argc < 3) {
-		ast_log(LOG_ERROR, "JabberSend requires 3 arguments: '%s'\n", (char *) data);
+		ast_log(LOG_ERROR, "JabberSend requires 3 arguments: '%s'\n", data);
 		return -1;
 	}
 

Modified: trunk/res/res_monitor.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/res/res_monitor.c?view=diff&rev=196227&r1=196226&r2=196227
==============================================================================
--- trunk/res/res_monitor.c (original)
+++ trunk/res/res_monitor.c Fri May 22 11:10:33 2009
@@ -476,12 +476,12 @@
 	);
 	
 	/* Parse arguments. */
-	if (ast_strlen_zero((char*)data)) {
+	if (ast_strlen_zero(data)) {
 		ast_log(LOG_ERROR, "Monitor requires an argument\n");
 		return 0;
 	}
 
-	parse = ast_strdupa((char*)data);
+	parse = ast_strdupa(data);
 	AST_STANDARD_APP_ARGS(args, parse);
 
 	if (!ast_strlen_zero(args.options)) {