kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-18 10:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@122127 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2008-06-12 14:51:44 +00:00
parent 5c2cf0f3c0
commit 50449140e8
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_forkcdr.c
View File

@@ -89,7 +89,7 @@ static char *descrip =
"cdr record is set to the current time. Future hang-up or ending events\n" "cdr record is set to the current time. Future hang-up or ending events\n"
"will not override this time stamp.\n" "will not override this time stamp.\n"
"Next, If the 'A' option is specified, the original cdr record will have\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" "from updating the original cdr record's disposition. Normally, an\n"
"'ANSWERED' event would mark all cdr records in the chain as 'ANSWERED'.\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" "Next, if the 'T' option is specified, the original cdr record will have\n"

12
main/cdr.c
View File

@@ -713,10 +713,6 @@ void ast_cdr_busy(struct ast_cdr *cdr)
{ {
for (; cdr; cdr = cdr->next) { 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)) { if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
check_post(cdr); check_post(cdr);
if (cdr->disposition < AST_CDR_BUSY) 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) void ast_cdr_failed(struct ast_cdr *cdr)
{ {
for (; cdr; cdr = cdr->next) { 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); check_post(cdr);
if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) { if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
if (cdr->disposition < AST_CDR_FAILED) if (cdr->disposition < AST_CDR_FAILED)
@@ -745,10 +737,6 @@ void ast_cdr_noanswer(struct ast_cdr *cdr)
char *chan; char *chan;
while (cdr) { 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>"; chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED)) if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))
ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan); ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);