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

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;

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 */
 	}
 }
 

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);