aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-03 21:48:39 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-03 21:48:39 +0000
commit215f014daf9b319a6b0837c2fe1569b692b1047a (patch)
tree865010176a79d62eefd95e752d66cebe22185786
parent15a6c177419fb24b6a4635db01ff2c58f99b874b (diff)
minor cleanup
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6956 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xChangeLog2
-rwxr-xr-xres/res_features.c5
2 files changed, 2 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0367cc5a5..27b4a71c8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
2005-11-03 Kevin P. Fleming <kpfleming@digium.com>
+ * res/res_features.c (ast_bridge_call): remove unused variables
+
* apps/app_dial.c (dial_exec_full): simplify options and flag usage
* include/asterisk/app.h: re-work application arg/option parsing APIs for consistent naming, add doxygen docs for option API
diff --git a/res/res_features.c b/res/res_features.c
index b973da595..50a71fde1 100755
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1259,7 +1259,6 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
struct ast_option_header *aoh;
struct timeval start = { 0 , 0 };
struct ast_bridge_config backup_config;
- int allowdisconnect_in, allowdisconnect_out, allowredirect_in, allowredirect_out;
char *monitor_exec;
memset(&backup_config, 0, sizeof(backup_config));
@@ -1283,10 +1282,6 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
pbx_exec(peer, monitor_app, monitor_exec, 1);
}
- allowdisconnect_in = ast_test_flag(&(config->features_callee), AST_FEATURE_DISCONNECT);
- allowdisconnect_out = ast_test_flag(&(config->features_caller), AST_FEATURE_DISCONNECT);
- allowredirect_in = ast_test_flag(&(config->features_callee), AST_FEATURE_REDIRECT);
- allowredirect_out = ast_test_flag(&(config->features_caller), AST_FEATURE_REDIRECT);
set_config_flags(chan, peer, config);
config->firstpass = 1;