summaryrefslogtreecommitdiff
path: root/main/bridging.c
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2013-01-21 20:15:57 +0000
committerRichard Mudgett <rmudgett@digium.com>2013-01-21 20:15:57 +0000
commitc6e6b7f2f12c1fe918aa052a19ac1bbeb4b63b3a (patch)
treec041a73341548e9aec20195ea78aaa00e797e3ce /main/bridging.c
parent8e3815a8ee9db8d7750223626c393f1a96e4ff3a (diff)
Made some bridging API calls void. Some bridging comments updated.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379753 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/bridging.c')
-rw-r--r--main/bridging.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/main/bridging.c b/main/bridging.c
index a87d543d8..ecb4abcec 100644
--- a/main/bridging.c
+++ b/main/bridging.c
@@ -1404,7 +1404,7 @@ int ast_bridge_features_hook(struct ast_bridge_features *features,
return 0;
}
-int ast_bridge_features_set_talk_detector(struct ast_bridge_features *features,
+void ast_bridge_features_set_talk_detector(struct ast_bridge_features *features,
ast_bridge_talking_indicate_callback talker_cb,
ast_bridge_talking_indicate_destructor talker_destructor,
void *pvt_data)
@@ -1412,7 +1412,6 @@ int ast_bridge_features_set_talk_detector(struct ast_bridge_features *features,
features->talker_cb = talker_cb;
features->talker_destructor_cb = talker_destructor;
features->talker_pvt_data = pvt_data;
- return 0;
}
int ast_bridge_features_enable(struct ast_bridge_features *features, enum ast_bridge_builtin_feature feature, const char *dtmf, void *config)
@@ -1436,11 +1435,10 @@ int ast_bridge_features_enable(struct ast_bridge_features *features, enum ast_br
return ast_bridge_features_hook(features, dtmf, builtin_features_handlers[feature], config, NULL);
}
-int ast_bridge_features_set_flag(struct ast_bridge_features *features, enum ast_bridge_feature_flags flag)
+void ast_bridge_features_set_flag(struct ast_bridge_features *features, enum ast_bridge_feature_flags flag)
{
ast_set_flag(&features->feature_flags, flag);
features->usable = 1;
- return 0;
}
int ast_bridge_features_init(struct ast_bridge_features *features)
@@ -1454,7 +1452,7 @@ int ast_bridge_features_init(struct ast_bridge_features *features)
return 0;
}
-int ast_bridge_features_cleanup(struct ast_bridge_features *features)
+void ast_bridge_features_cleanup(struct ast_bridge_features *features)
{
struct ast_bridge_features_hook *hook;
@@ -1469,8 +1467,6 @@ int ast_bridge_features_cleanup(struct ast_bridge_features *features)
features->talker_destructor_cb(features->talker_pvt_data);
features->talker_pvt_data = NULL;
}
-
- return 0;
}
int ast_bridge_dtmf_stream(struct ast_bridge *bridge, const char *dtmf, struct ast_channel *chan)