From: Moises Silva <moy@sangoma.com>
Date: Fri, 10 Sep 2010 18:09:06 +0000 (-0400)
Subject: freetdm: fix iterator usage
X-Git-Tag: v1.2-rc1~305^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=507b73070b65e0d28c4ce4714bb6d64d4cbff7f4;p=thirdparty%2Ffreeswitch.git

freetdm: fix iterator usage
---

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 6b4fec6d87..9d6188f8a0 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1516,7 +1516,7 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 		switch_channel_set_variable_printf(channel, "freetdm_custom_call_data", "%s", channel_caller_data->raw_data);
 	}
 	/* Add any channel variable to the dial plan */
-	iter = ftdm_channel_get_var_iterator(sigmsg->channel);
+	iter = ftdm_channel_get_var_iterator(sigmsg->channel, NULL);
 	for (curr = iter ; curr; curr = ftdm_iterator_next(curr)) {
 		ftdm_channel_get_current_var(curr, &var_name, &var_value);
 		snprintf(name, sizeof(name), FREETDM_VAR_PREFIX "%s", var_name);
@@ -2783,9 +2783,9 @@ static switch_status_t load_config(void)
 			switch_set_string(SPAN_CONFIG[span_id].dialplan, dialplan);
 			SPAN_CONFIG[span_id].analog_options = analog_options | globals.analog_options;
 			
-			chaniter = ftdm_span_get_chan_iterator(span);
-			curr = chaniter
-			for (curr = chaniter ; curr; curr = ftdm_iterator_next(curr)) {
+			chaniter = ftdm_span_get_chan_iterator(span, NULL);
+			curr = chaniter;
+			for (curr = chaniter; curr; curr = ftdm_iterator_next(curr)) {
 				fchan = ftdm_iterator_current(curr);
 				ftdm_channel_set_private(fchan, &SPAN_CONFIG[span_id].pvts[i]);
 			}