diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-11-30 19:34:47 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-11-30 19:34:47 +0000 |
| commit | fac74808203c697677a87d34ccc409a3fe203a95 (patch) | |
| tree | 7a9b4cd5fcd7c6762668e03902ccc2b5f07e8343 /main | |
| parent | 45f98e541997648441c9c33175ddb7ef48f96ab2 (diff) | |
Merged revisions 90348 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r90348 | russell | 2007-11-30 13:26:04 -0600 (Fri, 30 Nov 2007) | 8 lines
Change the behavior of ao2_link(). Previously, in inherited a reference.
Now, it automatically increases the reference count to reflect the reference
that is now held by the container.
This was done to be more consistent with ao2_unlink(), which automatically
releases the reference held by the container. It also makes it so it is
no longer possible for a pointer to be invalid after ao2_link() returns.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/astobj2.c | 1 | ||||
| -rw-r--r-- | main/config.c | 1 | ||||
| -rw-r--r-- | main/manager.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/main/astobj2.c b/main/astobj2.c index e7a091c80..2d3611889 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -363,6 +363,7 @@ void *ao2_link(struct ao2_container *c, void *user_data) p->version = ast_atomic_fetchadd_int(&c->version, 1); AST_LIST_INSERT_TAIL(&c->buckets[i], p, entry); ast_atomic_fetchadd_int(&c->elements, 1); + ao2_ref(user_data, +1); ao2_unlock(c); return p; diff --git a/main/config.c b/main/config.c index fc020c1b7..fe1e446c0 100644 --- a/main/config.c +++ b/main/config.c @@ -1431,7 +1431,6 @@ static void set_fn(char *fn, int fn_size, const char *file, const char *configfi fx->lineno = 1; *fi = fx; ao2_link(fileset, fx); - ao2_ref(fx,1); /* bump the ref count, so it looks like we just got the ref from find */ } } diff --git a/main/manager.c b/main/manager.c index d14619645..6b3bf700b 100644 --- a/main/manager.c +++ b/main/manager.c @@ -3087,8 +3087,6 @@ static void xml_translate(struct ast_str **out, char *in, struct ast_variable *v vc = ao2_alloc(sizeof(*vc), NULL); vc->varname = var; vc->count = 1; - /* Increment refcount, because we're going to deref once later */ - ao2_ref(vc, 1); ao2_link(vco, vc); } xml_copy_escape(out, var, xml ? 1 | 2 : 0); |