kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow chan_usbradio to compile again.

Browse Source 
Closes issue #11014, patch by seanbright.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-10-17 16:09:01 +00:00
parent 616ec5d340
commit c9f869e982
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_usbradio.c
View File

@@ -2446,6 +2446,7 @@ static struct chan_usbradio_pvt *store_config(struct ast_config *cfg, char *ctg)
struct ast_variable *v; struct ast_variable *v;
struct chan_usbradio_pvt *o; struct chan_usbradio_pvt *o;
struct ast_config *cfg1; struct ast_config *cfg1;
struct ast_flags config_flags = { 0 };
if (ctg == NULL) { if (ctg == NULL) {
traceusb1((" store_config() ctg == NULL\n")); 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) if (!cfg1)
{ {
o->rxmixerset = 500; o->rxmixerset = 500;
@@ -2733,12 +2734,13 @@ static int load_module(void)
{ {
struct ast_config *cfg = NULL; struct ast_config *cfg = NULL;
char *ctg = NULL; char *ctg = NULL;
struct ast_flags config_flags = { 0 };
/* Copy the default jb config over global_jbconf */ /* Copy the default jb config over global_jbconf */
memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf)); memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
/* load config file */ /* 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); ast_log(LOG_NOTICE, "Unable to load config %s\n", config);
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }

4
channels/xpmr/xpmr.c
View File

@@ -1817,8 +1817,8 @@ t_pmr_chan *createPmrChannel(t_pmr_chan *tChan, i16 numSamples)
#if XPMR_DEBUG0 == 1 #if XPMR_DEBUG0 == 1
{ {
TRACEX((" configure tracing\n"));
t_tdet *ptdet; t_tdet *ptdet;
TRACEX((" configure tracing\n"));
pChan->rxCtcss->pDebug0=calloc(numSamples,2); pChan->rxCtcss->pDebug0=calloc(numSamples,2);
pChan->rxCtcss->pDebug1=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) i16 destroyPmrChannel(t_pmr_chan *pChan)
{ {
t_pmr_sps *pmr_sps, *tmp_sps; t_pmr_sps *pmr_sps, *tmp_sps;
i16 i;
TRACEX(("destroyPmrChannel()\n")); TRACEX(("destroyPmrChannel()\n"));
@@ -1888,7 +1889,6 @@ i16 destroyPmrChannel(t_pmr_chan *pChan)
free(pChan->ptxDebug2); free(pChan->ptxDebug2);
free(pChan->ptxDebug3); free(pChan->ptxDebug3);
i16 i;
for(i=0;i<CTCSS_NUM_CODES;i++) for(i=0;i<CTCSS_NUM_CODES;i++)
{ {
free(pChan->rxCtcss->tdet[i].pDebug0); free(pChan->rxCtcss->tdet[i].pDebug0);