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

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Thu Feb 28 17:39:53 2008
New Revision: 105174

URL: http://svn.digium.com/view/asterisk?view=rev&rev=105174
Log:
coding guidelines 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=105174&r1=105173&r2=105174
==============================================================================
--- team/group/multiparking/main/features.c (original)
+++ team/group/multiparking/main/features.c Thu Feb 28 17:39:53 2008
@@ -106,7 +106,6 @@
 static int parkaddhints = 0;                               /*!< Add parking hints automatically */
 static int parkedcalltransfers = 0;                        /*!< Enable DTMF based transfers on bridge when picking up parked calls */
 static int parkedcallreparking = 0;                        /*!< Enable DTMF based parking on bridge when picking up parked calls */
-//static int parkingtime = DEFAULT_PARK_TIME;                /*!< No more than 45 seconds parked before you do something with them */
 
 static char pickup_ext[AST_MAX_EXTENSION];                 /*!< Call pickup extension */
 
@@ -841,12 +840,12 @@
 	count = ast_channel_audiohook_count_by_source(callee_chan, mixmonitor_spy_type, AST_AUDIOHOOK_TYPE_SPY);
 	ast_channel_unlock(callee_chan);
 
-	// This means a mixmonitor is attached to the channel, running or not is unknown.
+	/* This means a mixmonitor is attached to the channel, running or not is unknown. */
 	if (count > 0) {
 		
 		ast_verb(3, "User hit '%s' to stop recording call.\n", code);
 
-		//Make sure they are running
+		/* Make sure they are running */
 		ast_channel_lock(callee_chan);
 		count = ast_channel_audiohook_count_by_source_running(callee_chan, mixmonitor_spy_type, AST_AUDIOHOOK_TYPE_SPY);
 		ast_channel_unlock(callee_chan);
@@ -2426,32 +2425,27 @@
 */
 static void *do_parking_thread(void *ignore)
 {
-	char parkingslot[AST_MAX_EXTENSION];
+	int ms = -1;
 	fd_set rfds, efds;	/* results from previous select, to be preserved across loops. */
-
-	FD_ZERO(&rfds);
-	FD_ZERO(&efds);
+	fd_set nrfds, nefds;	/* args for the next select */
+	FD_ZERO(&nrfds);
+	FD_ZERO(&nefds);
 
 	for (;;) {
 		int res = 0;
-		int ms = -1;	/* select timeout, uninitialized */
-		int max = -1;	/* max fd, none there yet */
-		fd_set nrfds, nefds;	/* args for the next select */
-		FD_ZERO(&nrfds);
-		FD_ZERO(&nefds);
-
 		ASTOBJ_CONTAINER_TRAVERSE(&parkinglots, 1, do {
 			
 			ASTOBJ_WRLOCK(iterator);
 			res = manage_parkinglot(iterator, &rfds, &efds, &nrfds, &nefds);
 			ASTOBJ_UNLOCK(iterator);
 		} while (0) );
-		AST_LIST_TRAVERSE_SAFE_END;
-		AST_LIST_UNLOCK(&parkings);
+
 		rfds = nrfds;
 		efds = nefds;
 		{
 			struct timeval tv = ast_samp2tv(ms, 1000);
+			int ms = -1;	/* select timeout, uninitialized */
+			int max = -1;	/* max fd, none there yet */
 			/* Wait for something to happen */
 			ast_select(max + 1, &rfds, NULL, &efds, (ms > -1) ? &tv : NULL);
 		}
@@ -2537,8 +2531,6 @@
 	struct ast_channel *peer=NULL;
 	struct parkeduser *pu;
 	struct ast_context *con;
-	const char *parkinglotname;
-	struct ast_parkinglot *parkinglot;
 	int park = 0;
 	struct ast_bridge_config config;