diff options
| author | Mark Spencer <markster@digium.com> | 2005-01-10 14:46:59 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2005-01-10 14:46:59 +0000 |
| commit | 92eb0c2018018027bce11ece6b126cdabf3b25ea (patch) | |
| tree | 94729885f0b947fa8b165ec1de895249d579c6c0 /apps | |
| parent | e7cb9750213a8a88de1818f2d5b2b928c2661afd (diff) | |
More flagification, courtesy drumkilla (bug #3280)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/app_dial.c | 16 | ||||
| -rwxr-xr-x | apps/app_forkcdr.c | 2 | ||||
| -rwxr-xr-x | apps/app_queue.c | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 6604ca18a..20ca54344 100755 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1085,21 +1085,21 @@ static int dial_exec(struct ast_channel *chan, void *data) if (!res) { memset(&config,0,sizeof(struct ast_bridge_config)); if (play_to_caller) - config.features_caller |= AST_FEATURE_PLAY_WARNING; + ast_set_flag(&(config.features_caller), AST_FEATURE_PLAY_WARNING); if (play_to_callee) - config.features_callee |= AST_FEATURE_PLAY_WARNING; + ast_set_flag(&(config.features_callee), AST_FEATURE_PLAY_WARNING); if (ast_test_flag(&peerflags, DIAL_ALLOWREDIRECT_IN)) - config.features_callee |= AST_FEATURE_REDIRECT; + ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT); if (ast_test_flag(&peerflags, DIAL_ALLOWREDIRECT_OUT)) - config.features_caller |= AST_FEATURE_REDIRECT; + ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT); if (ast_test_flag(&peerflags, DIAL_ALLOWDISCONNECT_IN)) - config.features_callee |= AST_FEATURE_DISCONNECT; + ast_set_flag(&(config.features_callee), AST_FEATURE_DISCONNECT); if (ast_test_flag(&peerflags, DIAL_ALLOWDISCONNECT_OUT)) - config.features_caller |= AST_FEATURE_DISCONNECT; + ast_set_flag(&(config.features_caller), AST_FEATURE_DISCONNECT); if (ast_test_flag(&peerflags, DIAL_MONITOR_IN)) - config.features_callee |= AST_FEATURE_AUTOMON; + ast_set_flag(&(config.features_callee), AST_FEATURE_AUTOMON); if (ast_test_flag(&peerflags, DIAL_MONITOR_OUT)) - config.features_caller |= AST_FEATURE_AUTOMON; + ast_set_flag(&(config.features_caller), AST_FEATURE_AUTOMON); config.timelimit = timelimit; config.play_warning = play_warning; config.warning_freq = warning_freq; diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c index 4fd0953c7..227fb8737 100755 --- a/apps/app_forkcdr.c +++ b/apps/app_forkcdr.c @@ -41,7 +41,7 @@ static void ast_cdr_clone(struct ast_cdr *cdr) { gettimeofday(&newcdr->start, NULL); memset(&newcdr->answer, 0, sizeof(newcdr->answer)); newcdr->disposition = AST_CDR_NOANSWER; - ast_cdr_add_flag(cdr,AST_CDR_FLAG_CHILD|AST_CDR_FLAG_LOCKED); + ast_set_flag(cdr, AST_CDR_FLAG_CHILD|AST_CDR_FLAG_LOCKED); } static void ast_cdr_fork(struct ast_channel *chan) { diff --git a/apps/app_queue.c b/apps/app_queue.c index ef7115db4..4d2cd9813 100755 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1543,13 +1543,13 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri memset(&config,0,sizeof(struct ast_bridge_config)); if (ast_test_flag(&flags, QUEUE_FLAG_REDIR_IN)) - config.features_callee |= AST_FEATURE_REDIRECT; + ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT); if (ast_test_flag(&flags, QUEUE_FLAG_REDIR_OUT)) - config.features_caller |= AST_FEATURE_REDIRECT; + ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT); if (ast_test_flag(&flags, QUEUE_FLAG_DISCON_IN)) - config.features_callee |= AST_FEATURE_DISCONNECT; + ast_set_flag(&(config.features_callee), AST_FEATURE_DISCONNECT); if (ast_test_flag(&flags, QUEUE_FLAG_DISCON_OUT)) - config.features_caller |= AST_FEATURE_DISCONNECT; + ast_set_flag(&(config.features_caller), AST_FEATURE_DISCONNECT); bridge = ast_bridge_call(qe->chan,peer,&config); if (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten)) { |