[svn-commits] russell: branch russell/ast_channel_ao2 r183442 - in /team/russell/ast_channe...

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Mar 19 16:12:03 2009
New Revision: 183442

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183442
Log:
sync with trunk

Modified:
    team/russell/ast_channel_ao2/   (props changed)
    team/russell/ast_channel_ao2/apps/app_dial.c
    team/russell/ast_channel_ao2/include/asterisk/features.h
    team/russell/ast_channel_ao2/main/features.c

Propchange: team/russell/ast_channel_ao2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/russell/ast_channel_ao2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 19 16:12:03 2009
@@ -1,1 +1,1 @@
-/trunk:1-183388
+/trunk:1-183441

Modified: team/russell/ast_channel_ao2/apps/app_dial.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/ast_channel_ao2/apps/app_dial.c?view=diff&rev=183442&r1=183441&r2=183442
==============================================================================
--- team/russell/ast_channel_ao2/apps/app_dial.c (original)
+++ team/russell/ast_channel_ao2/apps/app_dial.c Thu Mar 19 16:12:03 2009
@@ -1107,7 +1107,7 @@
 static int detect_disconnect(struct ast_channel *chan, char code, struct ast_str *featurecode)
 {
 	struct ast_flags features = { AST_FEATURE_DISCONNECT }; /* only concerned with disconnect feature */
-	struct ast_call_feature feature;
+	struct ast_call_feature feature = { 0, };
 	int res;
 
 	ast_str_append(&featurecode, 1, "%c", code);

Modified: team/russell/ast_channel_ao2/include/asterisk/features.h
URL: http://svn.digium.com/svn-view/asterisk/team/russell/ast_channel_ao2/include/asterisk/features.h?view=diff&rev=183442&r1=183441&r2=183442
==============================================================================
--- team/russell/ast_channel_ao2/include/asterisk/features.h (original)
+++ team/russell/ast_channel_ao2/include/asterisk/features.h Thu Mar 19 16:12:03 2009
@@ -131,7 +131,11 @@
 void ast_unregister_feature(struct ast_call_feature *feature);
 
 /*! \brief detect a feature before bridging 
-    \para chan, ast_flags ptr, code, ast_call_feature ptr to be set if found */
+    \param chan
+    \param ast_flags ptr
+    \param char ptr of input code
+    \retval ast_call_feature ptr to be set if found 
+    \return result, was feature found or not */
 int ast_feature_detect(struct ast_channel *chan, struct ast_flags *features, char *code, struct ast_call_feature *feature);
 
 /*! \brief look for a call feature entry by its sname

Modified: team/russell/ast_channel_ao2/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/ast_channel_ao2/main/features.c?view=diff&rev=183442&r1=183441&r2=183442
==============================================================================
--- team/russell/ast_channel_ao2/main/features.c (original)
+++ team/russell/ast_channel_ao2/main/features.c Thu Mar 19 16:12:03 2009
@@ -2112,12 +2112,7 @@
 
 int ast_feature_detect(struct ast_channel *chan, struct ast_flags *features, char *code, struct ast_call_feature *feature) {
 
-	char *dynamic_features;
-	ast_channel_lock(chan);
-	dynamic_features = ast_strdupa(S_OR(pbx_builtin_getvar_helper(chan, "DYNAMIC_FEATURES"),""));
-	ast_channel_unlock(chan);
-
-	return feature_interpret_helper(chan, NULL, NULL, code, 0, dynamic_features, features, 0, feature);
+	return feature_interpret_helper(chan, NULL, NULL, code, 0, NULL, features, 0, feature);
 }
 
 static void set_config_flags(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config)