[asterisk-commits] dvossel: branch 1.6.0 r183437 - in /branches/1.6.0: ./ apps/ include/asterisk...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Mar 19 15:32:20 2009
New Revision: 183437

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183437
Log:
Merged revisions 183436 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r183436 | dvossel | 2009-03-19 15:30:39 -0500 (Thu, 19 Mar 2009) | 13 lines
  
  Merged revisions 183386 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r183386 | dvossel | 2009-03-19 14:40:07 -0500 (Thu, 19 Mar 2009) | 6 lines
    
    Cleaning up a few things in detect disconnect patch
    
    Initialized ast_call_feature in detect_disconnect to avoid accessing uninitialized memory.  Cleaned up /param tags in features.h.  No longer send dynamic features in ast_feature_detect. 
    
    issue #11583
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_dial.c
    branches/1.6.0/include/asterisk/features.h
    branches/1.6.0/main/features.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_dial.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/apps/app_dial.c?view=diff&rev=183437&r1=183436&r2=183437
==============================================================================
--- branches/1.6.0/apps/app_dial.c (original)
+++ branches/1.6.0/apps/app_dial.c Thu Mar 19 15:32:20 2009
@@ -869,7 +869,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: branches/1.6.0/include/asterisk/features.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/include/asterisk/features.h?view=diff&rev=183437&r1=183436&r2=183437
==============================================================================
--- branches/1.6.0/include/asterisk/features.h (original)
+++ branches/1.6.0/include/asterisk/features.h Thu Mar 19 15:32:20 2009
@@ -117,7 +117,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: branches/1.6.0/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/features.c?view=diff&rev=183437&r1=183436&r2=183437
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Thu Mar 19 15:32:20 2009
@@ -1841,12 +1841,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)