[svn-commits] murf: branch 1.4 r122127 - in /branches/1.4: apps/app_forkcdr.c main/cdr.c

[SVN commits to the Digium repositories]

Author: murf
Date: Thu Jun 12 09:51:44 2008
New Revision: 122127

URL: http://svn.digium.com/view/asterisk?view=rev&rev=122127
Log:
Arkadia tried to warn me, but the code added to ast_cdr_busy, _failed, and _noanswer was redundant. Didn't spot it until I was resolving conflicts in trunk. Ugh. Redundant code removed. It wasn't harmful. Just dumb.

Modified:
    branches/1.4/apps/app_forkcdr.c
    branches/1.4/main/cdr.c

Modified: branches/1.4/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_forkcdr.c?view=diff&rev=122127&r1=122126&r2=122127
==============================================================================
--- branches/1.4/apps/app_forkcdr.c (original)
+++ branches/1.4/apps/app_forkcdr.c Thu Jun 12 09:51:44 2008
@@ -89,7 +89,7 @@
 "cdr record is set to the current time. Future hang-up or ending events\n"
 "will not override this time stamp.\n"
 "Next, If the 'A' option is specified, the original cdr record will have\n"
-"it ANS_LOCKED flag set, which prevent future call dispostion events\n"
+"it ANS_LOCKED flag set, which prevent future answer events\n"
 "from updating the original cdr record's disposition. Normally, an\n"
 "'ANSWERED' event would mark all cdr records in the chain as 'ANSWERED'.\n"
 "Next, if the 'T' option is specified, the original cdr record will have\n"

Modified: branches/1.4/main/cdr.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/cdr.c?view=diff&rev=122127&r1=122126&r2=122127
==============================================================================
--- branches/1.4/main/cdr.c (original)
+++ branches/1.4/main/cdr.c Thu Jun 12 09:51:44 2008
@@ -713,10 +713,6 @@
 {
 
 	for (; cdr; cdr = cdr->next) {
-		if (ast_test_flag(cdr, AST_CDR_FLAG_ANSLOCKED)) 
-			continue;
-		if (ast_test_flag(cdr, AST_CDR_FLAG_DONT_TOUCH) && ast_test_flag(cdr, AST_CDR_FLAG_LOCKED))
-			continue;
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
 			check_post(cdr);
 			if (cdr->disposition < AST_CDR_BUSY)
@@ -728,10 +724,6 @@
 void ast_cdr_failed(struct ast_cdr *cdr)
 {
 	for (; cdr; cdr = cdr->next) {
-		if (ast_test_flag(cdr, AST_CDR_FLAG_ANSLOCKED)) 
-			continue;
-		if (ast_test_flag(cdr, AST_CDR_FLAG_DONT_TOUCH) && ast_test_flag(cdr, AST_CDR_FLAG_LOCKED))
-			continue;
 		check_post(cdr);
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
 			if (cdr->disposition < AST_CDR_FAILED)
@@ -745,10 +737,6 @@
 	char *chan; 
 
 	while (cdr) {
-		if (ast_test_flag(cdr, AST_CDR_FLAG_ANSLOCKED)) 
-			continue;
-		if (ast_test_flag(cdr, AST_CDR_FLAG_DONT_TOUCH) && ast_test_flag(cdr, AST_CDR_FLAG_LOCKED))
-			continue;
 		chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
 		if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))
 			ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);