Arkadia tried to warn me, but the code added to ast_cdr_busy, _failed, and _noanswer...

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@122127 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index 50cbddfdaaaf4ede1f5fc6f753d70e084cbecb8a..f8ab05f3fa7f2860fc25708121ab576073c707d6 100644 (file)
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -89,7 +89,7 @@ static char *descrip =
 "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"

diff --git a/main/cdr.c b/main/cdr.c
index 512f355ce0640979c4805517ac87e46ff1a7e6c8..45e39b6eb359b18cf3784eac8adfcef68565e7e4 100644 (file)
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -713,10 +713,6 @@ void ast_cdr_busy(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;
                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_busy(struct ast_cdr *cdr)
 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 @@ void ast_cdr_noanswer(struct ast_cdr *cdr)
        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);