[asterisk-commits] may: branch may/ooh323_ipv6 r306539 - in /team/may/ooh323_ipv6: ./ addons/

[SVN commits to the Asterisk project]

Author: may
Date: Sun Feb  6 16:45:01 2011
New Revision: 306539

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306539
Log:
restore automerge

Modified:
    team/may/ooh323_ipv6/   (props changed)
    team/may/ooh323_ipv6/addons/chan_ooh323.c

Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Feb  6 16:45:01 2011
@@ -1,1 +1,1 @@
-/trunk:1-306498
+/trunk:1-306538

Modified: team/may/ooh323_ipv6/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/addons/chan_ooh323.c?view=diff&rev=306539&r1=306538&r2=306539
==============================================================================
--- team/may/ooh323_ipv6/addons/chan_ooh323.c (original)
+++ team/may/ooh323_ipv6/addons/chan_ooh323.c Sun Feb  6 16:45:01 2011
@@ -2178,11 +2178,11 @@
 
    	user = ast_calloc(1,sizeof(struct ooh323_user));
 	if (user) {
+		memset(user, 0, sizeof(struct ooh323_user));
 		if (!(user->cap = ast_format_cap_alloc_nolock())) {
 			ast_free(user);
 			return NULL;
 		}
-		memset(user, 0, sizeof(struct ooh323_user));
 		ast_mutex_init(&user->lock);
 		ast_copy_string(user->name, name, sizeof(user->name));
 		ast_format_cap_copy(user->cap, gCap);
@@ -2293,11 +2293,11 @@
 
 	peer = ast_calloc(1, sizeof(*peer));
 	if (peer) {
+		memset(peer, 0, sizeof(struct ooh323_peer));
 		if (!(peer->cap = ast_format_cap_alloc_nolock())) {
 			ast_free(peer);
 			return NULL;
 		}
-		memset(peer, 0, sizeof(struct ooh323_peer));
 		ast_mutex_init(&peer->lock);
 		ast_copy_string(peer->name, name, sizeof(peer->name));
 		ast_format_cap_copy(peer->cap, gCap);