diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-17 16:09:01 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-17 16:09:01 +0000 |
commit | 1dd6cd6bc18ec13f54ce6e8b2e5b82e893c6c391 (patch) | |
tree | 399841093db5b3762ba54f2644cbd6fe15e74c2a /channels | |
parent | cfd74e7391ed7ae017b342cd0317db7d4502015f (diff) |
Allow chan_usbradio to compile again.
Closes issue #11014, patch by seanbright.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@86104 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_usbradio.c | 6 | ||||
-rwxr-xr-x | channels/xpmr/xpmr.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c index 99cd946c6..6e26e1e4c 100644 --- a/channels/chan_usbradio.c +++ b/channels/chan_usbradio.c @@ -2446,6 +2446,7 @@ static struct chan_usbradio_pvt *store_config(struct ast_config *cfg, char *ctg) 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 @@ static struct chan_usbradio_pvt *store_config(struct ast_config *cfg, char *ctg) ); } - cfg1 = ast_config_load(config1); + cfg1 = ast_config_load(config1, config_flags); if (!cfg1) { o->rxmixerset = 500; @@ -2733,12 +2734,13 @@ static int load_module(void) { 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; } diff --git a/channels/xpmr/xpmr.c b/channels/xpmr/xpmr.c index 4c968144d..a799ca9d3 100755 --- a/channels/xpmr/xpmr.c +++ b/channels/xpmr/xpmr.c @@ -1817,8 +1817,8 @@ t_pmr_chan *createPmrChannel(t_pmr_chan *tChan, i16 numSamples) #if XPMR_DEBUG0 == 1 { - TRACEX((" configure tracing\n")); t_tdet *ptdet; + TRACEX((" configure tracing\n")); pChan->rxCtcss->pDebug0=calloc(numSamples,2); pChan->rxCtcss->pDebug1=calloc(numSamples,2); @@ -1846,6 +1846,7 @@ t_pmr_chan *createPmrChannel(t_pmr_chan *tChan, i16 numSamples) i16 destroyPmrChannel(t_pmr_chan *pChan) { t_pmr_sps *pmr_sps, *tmp_sps; + i16 i; TRACEX(("destroyPmrChannel()\n")); @@ -1888,7 +1889,6 @@ i16 destroyPmrChannel(t_pmr_chan *pChan) free(pChan->ptxDebug2); free(pChan->ptxDebug3); - i16 i; for(i=0;i<CTCSS_NUM_CODES;i++) { free(pChan->rxCtcss->tdet[i].pDebug0); |