[svn-commits] jpeeler: branch 1.6.1 r146243 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Fri Oct  3 17:42:10 2008
New Revision: 146243

URL: http://svn.digium.com/view/asterisk?view=rev&rev=146243
Log:
Merged revisions 146242 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r146242 | jpeeler | 2008-10-03 17:40:59 -0500 (Fri, 03 Oct 2008) | 1 line

remove superfluous reference counting operations in manage_parkinglot since ao2_interator_next increments the ref count automatically
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/features.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=146243&r1=146242&r2=146243
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Fri Oct  3 17:42:10 2008
@@ -2500,7 +2500,7 @@
 		);
 }
 
-/*! \brief Run management on parkinglots, collad once per parkinglot */
+/*! \brief Run management on parkinglots, called once per parkinglot */
 int manage_parkinglot(struct ast_parkinglot *curlot, fd_set *rfds, fd_set *efds, fd_set *nrfds, fd_set *nefds, int *ms, int *max)
 {
 
@@ -2508,8 +2508,6 @@
 	int res = 0;
 	char parkingslot[AST_MAX_EXTENSION];
 
-	/* TODO: I believe this reference increase is not necessary since the iterator in the calling function already did so */
-	//parkinglot_addref(curlot);
 	/* Lock parking list */
 	AST_LIST_LOCK(&curlot->parkings);
 	AST_LIST_TRAVERSE_SAFE_BEGIN(&curlot->parkings, pu, list) {
@@ -2593,7 +2591,6 @@
 			} else
 				ast_log(LOG_WARNING, "Whoa, no parking context?\n");
 			AST_LIST_REMOVE_CURRENT(list);
-			parkinglot_unref(curlot);
 		} else {	/* still within parking time, process descriptors */
 			for (x = 0; x < AST_MAX_FDS; x++) {
 				struct ast_frame *f;
@@ -2628,7 +2625,6 @@
 					} else
 						ast_log(LOG_WARNING, "Whoa, no parking context for parking lot %s?\n", curlot->name);
 					AST_LIST_REMOVE_CURRENT(list);
-					parkinglot_unref(curlot);
 					break;
 				} else {
 					/* XXX Maybe we could do something with packets, like dial "0" for operator or something XXX */