[svn-commits] twilson: branch twilson/config_docs r370475 - in /team/twilson/config_docs: ....

[SVN commits to the Digium repositories]

Author: twilson
Date: Tue Jul 24 23:02:13 2012
New Revision: 370475

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=370475
Log:
Revert a change that broke compilation

1) There is no such function as ast_ref()
2) The patch was originally credited as the one uploaded by Guenther
   Kelleter (license 6372) via issue AST-921, but the patch committed
   was not the patch referenced on the issue.
3) Guenther Kelleter's patch was actually correct. It moved the
   ast_free above the presencechange_cleanup label. I am not
   committing his change as it is not technically necesary--calling
   ast_free(NULL) is perfectly safe and I worry that moving the
   ast_free outside of the label could lead to future bugs if
   someone ever adds another failure conditional and expects
   'goto presencechange_cleanup;' to clean up after everything.
........

Merged revisions 370474 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/twilson/config_docs/   (props changed)
    team/twilson/config_docs/main/pbx.c

Propchange: team/twilson/config_docs/
------------------------------------------------------------------------------
--- branch-10-digiumphones-merged (original)
+++ branch-10-digiumphones-merged Tue Jul 24 23:02:13 2012
@@ -1,1 +1,1 @@
-/branches/10-digiumphones:364766,365396,368791,368963-368965,368999,369026,370465
+/branches/10-digiumphones:364766,365396,368791,368963-368965,368999,369026

Propchange: team/twilson/config_docs/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 24 23:02:13 2012
@@ -1,1 +1,1 @@
-/trunk:1-370470
+/trunk:1-370474

Modified: team/twilson/config_docs/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/twilson/config_docs/main/pbx.c?view=diff&rev=370475&r1=370474&r2=370475
==============================================================================
--- team/twilson/config_docs/main/pbx.c (original)
+++ team/twilson/config_docs/main/pbx.c Tue Jul 24 23:02:13 2012
@@ -4820,7 +4820,7 @@
 	res = 0;
 
 presencechange_cleanup:
-	ast_ref(hint_app, -1);
+	ast_free(hint_app);
 	ao2_ref(pc, -1);
 
 	return res;