[asterisk-commits] oej: branch group/multiparking r104059 - /team/group/multiparking/main/

[SVN commits to the Asterisk project]

Author: oej
Date: Sat Feb 23 10:54:11 2008
New Revision: 104059

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104059
Log:
Occupiedlots needs to go away

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=104059&r1=104058&r2=104059
==============================================================================
--- team/group/multiparking/main/features.c (original)
+++ team/group/multiparking/main/features.c Sat Feb 23 10:54:11 2008
@@ -142,7 +142,6 @@
 	int parking_offset;
 	int parkfindnext;
 	int parkingtime;				/*!< Default parking time */
-	struct parkeduser *occupiedlots;
 	char mohclass[MAX_MUSICCLASS];                  /*!< Music class used for parking */
 	struct parkinglot_parklist parkings;		/*!< List of active parkings in this parkinglot */
 };
@@ -487,7 +486,7 @@
 		parking_range = parkinglot->parking_stop - parkinglot->parking_start+1;
 		for (i = 0; i < parking_range; i++) {
 			x = (i + parkinglot->parking_offset) % parking_range + parkinglot->parking_start;
-			cur = parkinglot->occupiedlots;
+			cur = parkinglot->occupiedlots; SKREP
 			while (cur) {
 				if (cur->parkingnum == x)
 					break;
@@ -535,7 +534,7 @@
 	ast_copy_string(pu->context, S_OR(chan->macrocontext, chan->context), sizeof(pu->context));
 	ast_copy_string(pu->exten, S_OR(chan->macroexten, chan->exten), sizeof(pu->exten));
 	pu->priority = chan->macropriority ? chan->macropriority : chan->priority;
-	pu->next = parkinglot->occupiedlots;
+	pu->next = parkinglot->occupiedlots; SKREP
 	parkinglot->occupiedlots = pu;
 
 	/* If parking a channel directly, don't quiet yet get parking running on it */
@@ -2823,11 +2822,6 @@
 		"featuremap",
 		"applicationmap"
 	};
-
-	if (!ast_strlen_zero(parking_con)) {
-		strcpy(old_parking_ext, parking_ext);
-		strcpy(old_parking_con, parking_con);
-	} 
 
 	if (default_parkinglot) {
 		strcpy(old_parking_con, default_parkinglot->parking_con);