From 40ce5e0d18520cd7a440cd8849e3e920be68f471 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Wed, 17 Jul 2013 22:30:28 +0000 Subject: Change ast_hangup() to return void and be NULL safe. Since ast_hangup() is effectively a channel destructor, it should be a void function. * Make the few silly callers checking the return value no longer do so. Only the CDR and CEL unit tests checked the return value. * Make all callers take advantage of the NULL safe change and remove the NULL check before the call. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@394623 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'apps/app_meetme.c') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 70719608b..0dee92647 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2368,10 +2368,8 @@ static int conf_free(struct ast_conference *conf) if (conf->origframe) ast_frfree(conf->origframe); - if (conf->lchan) - ast_hangup(conf->lchan); - if (conf->chan) - ast_hangup(conf->chan); + ast_hangup(conf->lchan); + ast_hangup(conf->chan); if (conf->fd >= 0) close(conf->fd); if (conf->recordingfilename) { -- cgit v1.2.3