From c25a442dfbda4bb30625e50a03aa9770c54dda01 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Tue, 21 Feb 2012 20:17:52 +0000 Subject: Fix some opaquification-related compiler warnings (closes issue ASTERISK-19419) PseudoReview - seanbright on IRC git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356152 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_monitor.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'res') diff --git a/res/res_monitor.c b/res/res_monitor.c index 045fa6aa7..5482f549c 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -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, ((strcmp(args.format, "gsm")) ? "wav" : "gsm")); ast_channel_lock(chan); - if (!ast_channel_cdr(chan) && !(chan_cdr = ast_cdr_alloc())) { - ast_channel_unlock(chan); - return -1; + if (!ast_channel_cdr(chan)) { + if (!(chan_cdr = ast_cdr_alloc())) { + 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_channel_unlock(chan); } -- cgit v1.2.3