[svn-commits] mvanbaak: branch group/multiparking r104079 - /team/group/multiparking/main/

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Sun Feb 24 08:17:43 2008
New Revision: 104079

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104079
Log:
updates

Modified:
    team/group/multiparking/main/features.c

Modified: team/group/multiparking/main/features.c
URL: http://svn.digium.com/view/asterisk/team/group/multiparking/main/features.c?view=diff&rev=104079&r1=104078&r2=104079
==============================================================================
--- team/group/multiparking/main/features.c (original)
+++ team/group/multiparking/main/features.c Sun Feb 24 08:17:43 2008
@@ -2399,8 +2399,8 @@
 					if (pu->moh_trys < 3 && !chan->generatordata) {
 						ast_debug(1, "MOH on parked call stopped by outside source.  Restarting on channel %s.\n", chan->name);
 						ast_indicate_data(chan, AST_CONTROL_HOLD, 
-							S_ORcurlot->mohclass, NULL),
-							!ast_strlen_zero(curlot->mohclass) ? strlen(curlot->mohclass) + 1 : 0);
+							S_OR(curlot->mohclass, NULL),
+							(!ast_strlen_zero(curlot->mohclass) ? strlen(curlot->mohclass) + 1 : 0));
 						pu->moh_trys++;
 					}
 					goto std;	/* XXX Ick: jumping into an else statement??? XXX */
@@ -2456,7 +2456,7 @@
 			res = manage_parkinglot(iterator, &rfds, &efds, &nrfds, &nefds);
 			ASTOBJ_UNLOCK(iterator);
 		} while (0) );
-		AST_LIST_TRAVERSE_SAFE_END
+		AST_LIST_TRAVERSE_SAFE_END;
 		AST_LIST_UNLOCK(&parkings);
 		rfds = nrfds;
 		efds = nefds;
@@ -2595,7 +2595,7 @@
 	if (chan->_state != AST_STATE_UP)
 		ast_answer(chan);
 
-	AST_OBJ_UNLOCK(parkinglot);
+	ASTOBJ_UNLOCK(parkinglot);
 
 	if (peer) {
 		/* Play a courtesy to the source(s) configured to prefix the bridge connecting */