[asterisk-commits] qwell: trunk r86104 - in /trunk/channels: chan_usbradio.c xpmr/xpmr.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Oct 17 11:09:01 2007
New Revision: 86104

URL: http://svn.digium.com/view/asterisk?view=rev&rev=86104
Log:
Allow chan_usbradio to compile again.

Closes issue #11014, patch by seanbright.

Modified:
    trunk/channels/chan_usbradio.c
    trunk/channels/xpmr/xpmr.c

Modified: trunk/channels/chan_usbradio.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_usbradio.c?view=diff&rev=86104&r1=86103&r2=86104
==============================================================================
--- trunk/channels/chan_usbradio.c (original)
+++ trunk/channels/chan_usbradio.c Wed Oct 17 11:09:01 2007
@@ -2446,6 +2446,7 @@
 	struct ast_variable *v;
 	struct chan_usbradio_pvt *o;
 	struct ast_config *cfg1;
+	struct ast_flags config_flags = { 0 };
 
 	if (ctg == NULL) {
 		traceusb1((" store_config() ctg == NULL\n"));
@@ -2510,7 +2511,7 @@
 			);
 	}
 	
-	cfg1 = ast_config_load(config1);
+	cfg1 = ast_config_load(config1, config_flags);
 	if (!cfg1)
 	{
 		o->rxmixerset = 500;
@@ -2733,12 +2734,13 @@
 {
 	struct ast_config *cfg = NULL;
 	char *ctg = NULL;
+	struct ast_flags config_flags = { 0 };
 
 	/* Copy the default jb config over global_jbconf */
 	memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
 
 	/* load config file */
-	if (!(cfg = ast_config_load(config))) {
+	if (!(cfg = ast_config_load(config, config_flags))) {
 		ast_log(LOG_NOTICE, "Unable to load config %s\n", config);
 		return AST_MODULE_LOAD_DECLINE;
 	}

Modified: trunk/channels/xpmr/xpmr.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/xpmr/xpmr.c?view=diff&rev=86104&r1=86103&r2=86104
==============================================================================
--- trunk/channels/xpmr/xpmr.c (original)
+++ trunk/channels/xpmr/xpmr.c Wed Oct 17 11:09:01 2007
@@ -1817,8 +1817,8 @@
 
 	#if XPMR_DEBUG0 == 1
 	{
+	    t_tdet     	*ptdet;
 		TRACEX((" configure tracing\n"));
-	    t_tdet     	*ptdet;
 		
 		pChan->rxCtcss->pDebug0=calloc(numSamples,2);
 		pChan->rxCtcss->pDebug1=calloc(numSamples,2);
@@ -1846,6 +1846,7 @@
 i16 destroyPmrChannel(t_pmr_chan *pChan)
 {
 	t_pmr_sps  	*pmr_sps, *tmp_sps;
+	i16 i;
 
 	TRACEX(("destroyPmrChannel()\n"));
 
@@ -1888,7 +1889,6 @@
 	free(pChan->ptxDebug2);
 	free(pChan->ptxDebug3);
 
-	i16 i;
 	for(i=0;i<CTCSS_NUM_CODES;i++)
 	{
 		free(pChan->rxCtcss->tdet[i].pDebug0);