aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-08-23 15:33:27 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-08-23 15:33:27 +0000
commit1a946d78a728930d3b2261641bb2e7c55afeb095 (patch)
treec25de060750f8c2c5de8bc685b506a0e4a40d8c9 /res
parent7cc45023c7522bf8c0ce28122bffc91fe3c1bc05 (diff)
formatting fixes and compile fix for FreeBSD (issue #5004)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6381 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rwxr-xr-xres/res_features.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/res/res_features.c b/res/res_features.c
index 8fac01e80..35fcec02e 100755
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -974,7 +974,7 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p
else
ast_copy_flags(&features, &(config->features_callee), AST_FLAGS_ALL);
ast_log(LOG_DEBUG, "Feature interpret: chan=%s, peer=%s, sense=%d, features=%d\n", chan->name, peer->name, sense, features.flags);
- for (x=0;x<FEATURES_COUNT;x++) {
+ for (x=0; x < FEATURES_COUNT; x++) {
if ((ast_test_flag(&features, builtin_features[x].feature_mask)) &&
!ast_strlen_zero(builtin_features[x].exten)) {
/* Feature is up for consideration */
@@ -1029,8 +1029,9 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p
static void set_config_flags(struct ast_bridge_config *config)
{
int x;
+
ast_clear_flag(config, AST_FLAGS_ALL);
- for (x=0;x<FEATURES_COUNT;x++) {
+ for (x = 0; x < FEATURES_COUNT; x++) {
if (ast_test_flag(&(config->features_caller), builtin_features[x].feature_mask)) {
if (ast_test_flag(builtin_features + x, AST_FEATURE_FLAG_NEEDSDTMF))
ast_set_flag(config, AST_BRIDGE_DTMF_CHANNEL_0);
@@ -1986,13 +1987,13 @@ static int load_config(void)
var = ast_variable_browse(cfg, "applicationmap");
while(var) {
char *tmp_val=strdup(var->value);
+ char *exten, *party=NULL, *app=NULL, *app_args=NULL;
if (!tmp_val) {
ast_log(LOG_ERROR, "res_features: strdup failed");
continue;
}
- char *exten, *party=NULL, *app=NULL, *app_args=NULL;
exten=strsep(&tmp_val,",");
if (exten) party=strsep(&tmp_val,",");