diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-10-09 16:59:59 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-10-09 16:59:59 -0500 |
| commit | 69f5b3da7ccaab0e3db7a3de9d89bf5d79de15b6 (patch) | |
| tree | 285f89b7b58c778dafbdb5635b3b766fe74cf39c /main/cdr.c | |
| parent | c3d6f3d6567a3b5f86a684864fb61b241f6bed0d (diff) | |
| parent | b48eeff44c87c28698d47fccb03173e32ef9aae6 (diff) | |
Merge "cdr.c: Replace inlined code with ao2_t_replace()" into 15
Diffstat (limited to 'main/cdr.c')
| -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 */ |