[svn-commits] mvanbaak: branch group/multiparking r103747 - /team/group/multiparking/channels/

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Sat Feb 16 03:36:36 2008
New Revision: 103747

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103747
Log:
make chan_zap compile again

Modified:
    team/group/multiparking/channels/chan_zap.c

Modified: team/group/multiparking/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/group/multiparking/channels/chan_zap.c?view=diff&rev=103747&r1=103746&r2=103747
==============================================================================
--- team/group/multiparking/channels/chan_zap.c (original)
+++ team/group/multiparking/channels/chan_zap.c Sat Feb 16 03:36:36 2008
@@ -595,7 +595,7 @@
 	char language[MAX_LANGUAGE];
 	char mohinterpret[MAX_MUSICCLASS];
 	char mohsuggest[MAX_MUSICCLASS];
-	AST_STRING_FIELD(parkinglot);		/*!< Parking lot for this channel */
+	char parkinglot[AST_MAX_EXTENSION]; /*!< Parking lot for this channel */
 #if defined(PRI_ANI) || defined(HAVE_SS7)
 	char cid_ani[AST_MAX_EXTENSION];
 #endif
@@ -774,6 +774,7 @@
 			.cid_name = "",
 			.mohinterpret = "default",
 			.mohsuggest = "",
+			.parkinglot = "",
 			.transfertobusy = 1,
 
 			.cid_signalling = CID_SIG_BELL,
@@ -8019,6 +8020,7 @@
 	struct zt_bufferinfo bi;
 #endif
 	struct zt_spaninfo si;
+
 	int res;
 	int span=0;
 	int here = 0;
@@ -8423,7 +8425,7 @@
 		ast_copy_string(tmp->mohsuggest, conf.chan.mohsuggest, sizeof(tmp->mohsuggest));
 		ast_copy_string(tmp->context, conf.chan.context, sizeof(tmp->context));
 		ast_copy_string(tmp->cid_num, conf.chan.cid_num, sizeof(tmp->cid_num));
-		ast_string_field_set((tmp->parkinglot, parkinglot, sizeof(tmp->parkinglot));
+		ast_copy_string(tmp->parkinglot, conf.chan.parkinglot, sizeof(tmp->parkinglot));
 		tmp->cid_ton = 0;
 		ast_copy_string(tmp->cid_name, conf.chan.cid_name, sizeof(tmp->cid_name));
 		ast_copy_string(tmp->mailbox, conf.chan.mailbox, sizeof(tmp->mailbox));