[Asterisk-cvs] asterisk/apps app_dial.c, 1.123, 1.124 app_forkcdr.c, 1.3, 1.4 app_queue.c, 1.113, 1.114

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv31886/apps

Modified Files:
	app_dial.c app_forkcdr.c app_queue.c 
Log Message:
More flagification, courtesy drumkilla (bug #3280)


Index: app_dial.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- app_dial.c	8 Jan 2005 17:23:29 -0000	1.123
+++ app_dial.c	10 Jan 2005 14:46:59 -0000	1.124
@@ -1085,21 +1085,21 @@
 		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;

Index: app_forkcdr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_forkcdr.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- app_forkcdr.c	19 Nov 2004 17:52:53 -0000	1.3
+++ app_forkcdr.c	10 Jan 2005 14:46:59 -0000	1.4
@@ -41,7 +41,7 @@
 	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) {

Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- app_queue.c	8 Jan 2005 19:00:46 -0000	1.113
+++ app_queue.c	10 Jan 2005 14:46:59 -0000	1.114
@@ -1543,13 +1543,13 @@
 
 		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)) {