kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "cdr.c: Replace redundant check with an ast_assert()"

Browse Source
This commit is contained in:
Jenkins2
2017-10-09 20:04:33 -05:00
committed by Gerrit Code Review
parent 7002705940 fdf9aacca3
commit 7d9fa0bea4
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/cdr.c
View File

@@ -1616,11 +1616,9 @@ static int single_state_process_parking_bridge_enter(struct cdr_object *cdr, str
static void dial_state_process_party_b(struct cdr_object *cdr, struct ast_channel_snapshot *snapshot) static void dial_state_process_party_b(struct cdr_object *cdr, struct ast_channel_snapshot *snapshot)
{ {
ast_assert(snapshot != NULL); ast_assert(snapshot != NULL);
ast_assert(cdr->party_b.snapshot
&& !strcasecmp(cdr->party_b.snapshot->name, snapshot->name));
if (!cdr->party_b.snapshot
|| strcasecmp(cdr->party_b.snapshot->name, snapshot->name)) {
return;
}
cdr_object_swap_snapshot(&cdr->party_b, snapshot); cdr_object_swap_snapshot(&cdr->party_b, snapshot);
/* If party B hangs up, finalize this CDR */ /* If party B hangs up, finalize this CDR */
@@ -1816,10 +1814,9 @@ static int dialed_pending_state_process_dial_begin(struct cdr_object *cdr, struc
static void bridge_state_process_party_b(struct cdr_object *cdr, struct ast_channel_snapshot *snapshot) static void bridge_state_process_party_b(struct cdr_object *cdr, struct ast_channel_snapshot *snapshot)
{ {
if (!cdr->party_b.snapshot ast_assert(cdr->party_b.snapshot
|| strcasecmp(cdr->party_b.snapshot->name, snapshot->name)) { && !strcasecmp(cdr->party_b.snapshot->name, snapshot->name));
return;
}
cdr_object_swap_snapshot(&cdr->party_b, snapshot); cdr_object_swap_snapshot(&cdr->party_b, snapshot);
/* If party B hangs up, finalize this CDR */ /* If party B hangs up, finalize this CDR */