[svn-commits] murf: branch 1.6.0 r122129 - in /branches/1.6.0: ./ apps/ main/

[SVN commits to the Digium repositories]

Author: murf
Date: Thu Jun 12 10:01:34 2008
New Revision: 122129

URL: http://svn.digium.com/view/asterisk?view=rev&rev=122129
Log:
Merged revisions 122128 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r122128 | murf | 2008-06-12 08:56:26 -0600 (Thu, 12 Jun 2008) | 9 lines

Merged revisions 122127 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r122127 | murf | 2008-06-12 08:51:44 -0600 (Thu, 12 Jun 2008) | 1 line

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.6.0/   (props changed)
    branches/1.6.0/CHANGES
    branches/1.6.0/apps/app_forkcdr.c
    branches/1.6.0/main/cdr.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/CHANGES
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/CHANGES?view=diff&rev=122129&r1=122128&r2=122129
==============================================================================
--- branches/1.6.0/CHANGES (original)
+++ branches/1.6.0/CHANGES Thu Jun 12 10:01:34 2008
@@ -387,8 +387,7 @@
     from the orig CDR to the new CDR after reset; 'e' sets the 'end' time on the
     original CDR; 'R' prevents the new CDR from being reset; 's(var=val)' adds/changes
     the 'var' variable on the original CDR; 'T' forces ast_cdr_end(), ast_cdr_answer(),
-    _busy(), failed(), etc, to all obey the LOCKED flag on cdr's in the chain, and
-    also the ast_cdr_setvar() func.
+    to obey the LOCKED flag on cdr's in the chain, and also the ast_cdr_setvar() func.
 
 Music On Hold Changes
 ---------------------

Modified: branches/1.6.0/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_forkcdr.c?view=diff&rev=122129&r1=122128&r2=122129
==============================================================================
--- branches/1.6.0/apps/app_forkcdr.c (original)
+++ branches/1.6.0/apps/app_forkcdr.c Thu Jun 12 10:01:34 2008
@@ -83,7 +83,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.6.0/main/cdr.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/cdr.c?view=diff&rev=122129&r1=122128&r2=122129
==============================================================================
--- branches/1.6.0/main/cdr.c (original)
+++ branches/1.6.0/main/cdr.c Thu Jun 12 10:01:34 2008
@@ -707,10 +707,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)
@@ -722,10 +718,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)) {
 			check_post(cdr);
@@ -740,10 +732,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;
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
 			chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
 			if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))