diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-10-09 16:52:29 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-10-09 16:52:29 -0500 |
| commit | a1528247981ed0aa457b9c5732d1bf0139b37409 (patch) | |
| tree | af401b8f4e9fbb04ec99b726413b5f61555f410e | |
| parent | b877181cd99d5480dd7724c1a72c973e7d6a0970 (diff) | |
| parent | 2e4b5fadbd919589ad44fdb1782b8db4ebb7e145 (diff) | |
Merge "cdr.c: Replace inlined code with ao2_t_replace()"
| -rw-r--r-- | main/cdr.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/main/cdr.c b/main/cdr.c index 1817e80a7..1a3ff87b3 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -751,11 +751,7 @@ static void free_variables(struct varshead *headp) */ static void cdr_object_snapshot_copy(struct cdr_object_snapshot *dst, struct cdr_object_snapshot *src) { - if (dst->snapshot) { - ao2_t_ref(dst->snapshot, -1, "release old snapshot during copy"); - } - dst->snapshot = src->snapshot; - ao2_t_ref(dst->snapshot, +1, "bump new snapshot during copy"); + ao2_t_replace(dst->snapshot, src->snapshot, "CDR snapshot copy"); strcpy(dst->userfield, src->userfield); dst->flags = src->flags; copy_variables(&dst->variables, &src->variables); @@ -1358,11 +1354,7 @@ static void cdr_object_swap_snapshot(struct cdr_object_snapshot *old_snapshot, struct ast_channel_snapshot *new_snapshot) { cdr_object_update_cid(old_snapshot, new_snapshot); - if (old_snapshot->snapshot) { - ao2_t_ref(old_snapshot->snapshot, -1, "Drop ref for swap"); - } - ao2_t_ref(new_snapshot, +1, "Bump ref for swap"); - old_snapshot->snapshot = new_snapshot; + ao2_t_replace(old_snapshot->snapshot, new_snapshot, "Swap CDR shapshot"); } /* BASE METHOD IMPLEMENTATIONS */ |