kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-15 22:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some opaquification-related compiler warnings

Browse Source 
(closes issue ASTERISK-19419)
PseudoReview - seanbright on IRC


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2012-02-21 20:17:52 +00:00
parent 1c971ae604
commit c25a442dfb
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/channel.c
View File

@@ -2926,7 +2926,7 @@ static int generator_force(const void *data)
int ast_activate_generator(struct ast_channel *chan, struct ast_generator *gen, void *params) int ast_activate_generator(struct ast_channel *chan, struct ast_generator *gen, void *params)
{ {
int res = 0; int res = 0;
void *generatordata; void *generatordata = NULL;
ast_channel_lock(chan); ast_channel_lock(chan);
if (ast_channel_generatordata(chan)) { if (ast_channel_generatordata(chan)) {
@@ -2937,10 +2937,12 @@ int ast_activate_generator(struct ast_channel *chan, struct ast_generator *gen,
if (gen->alloc && !(generatordata = gen->alloc(chan, params))) { if (gen->alloc && !(generatordata = gen->alloc(chan, params))) {
res = -1; res = -1;
} }
if (generatordata) {
ast_channel_generator_set(chan, gen);
}
if (!res) { if (!res) {
ast_settimeout(chan, 50, generator_force, chan); ast_settimeout(chan, 50, generator_force, chan);
ast_channel_generatordata_set(chan, generatordata); ast_channel_generatordata_set(chan, generatordata);
ast_channel_generator_set(chan, gen);
} }
ast_channel_unlock(chan); ast_channel_unlock(chan);

10
main/framehook.c
View File

@@ -104,12 +104,14 @@ int ast_framehook_attach(struct ast_channel *chan, struct ast_framehook_interfac
framehook->chan = chan; framehook->chan = chan;
/* create the framehook list if it didn't already exist */ /* create the framehook list if it didn't already exist */
if (!ast_channel_framehooks(chan) && !(fh_list = ast_calloc(1, sizeof(*ast_channel_framehooks(chan))))) { if (!ast_channel_framehooks(chan)) {
ast_free(framehook); if (!(fh_list = ast_calloc(1, sizeof(*ast_channel_framehooks(chan))))) {
return -1; ast_free(framehook);
return -1;
}
ast_channel_framehooks_set(chan, fh_list);
} }
ast_channel_framehooks_set(chan, fh_list);
framehook->id = ++ast_channel_framehooks(chan)->id_count; framehook->id = ++ast_channel_framehooks(chan)->id_count;
AST_LIST_INSERT_TAIL(&ast_channel_framehooks(chan)->list, framehook, list); AST_LIST_INSERT_TAIL(&ast_channel_framehooks(chan)->list, framehook, list);

10
res/res_monitor.c
View File

@@ -689,11 +689,13 @@ static int start_monitor_exec(struct ast_channel *chan, const char *data)
snprintf(tmp, sizeof(tmp), "%s/%s.%s", urlprefix, args.fname_base, snprintf(tmp, sizeof(tmp), "%s/%s.%s", urlprefix, args.fname_base,
((strcmp(args.format, "gsm")) ? "wav" : "gsm")); ((strcmp(args.format, "gsm")) ? "wav" : "gsm"));
ast_channel_lock(chan); ast_channel_lock(chan);
if (!ast_channel_cdr(chan) && !(chan_cdr = ast_cdr_alloc())) { if (!ast_channel_cdr(chan)) {
ast_channel_unlock(chan); if (!(chan_cdr = ast_cdr_alloc())) {
return -1; ast_channel_unlock(chan);
return -1;
}
ast_channel_cdr_set(chan, chan_cdr);
} }
ast_channel_cdr_set(chan, chan_cdr);
ast_cdr_setuserfield(chan, tmp); ast_cdr_setuserfield(chan, tmp);
ast_channel_unlock(chan); ast_channel_unlock(chan);
} }