diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-12 14:51:44 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-12 14:51:44 +0000 |
| commit | f87c5a689be6740c65bb7f872ed87ac2713adaca (patch) | |
| tree | 3bbb3bafa4ddad85343408c766b9c2361cd19e43 | |
| parent | 2f3d431a368d7699371f1758a55ce75d43196503 (diff) | |
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.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@122127 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_forkcdr.c | 2 | ||||
| -rw-r--r-- | main/cdr.c | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c index 50cbddfda..f8ab05f3f 100644 --- 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 512f355ce..45e39b6eb 100644 --- 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); |