From dbda69d5b560f9175ccf1f96dadcd11294dc2a00 Mon Sep 17 00:00:00 2001 From: Mikko Lehto Date: Mon, 23 May 2016 23:49:59 +0300 Subject: [PATCH] modules/[call_control|mediaproxy]: proper assigment to NULL pointer CC (clang) [M mediaproxy.so] mediaproxy.o mediaproxy.c:1929:27: warning: expression which evaluates to zero treated as a null pointer constant of type 'void *' [-Wnon-literal-null-conversion] *_params->param = MPInactive; ^~~~~~~~~~ (cherry picked from commit 700b334b51b39056c4c0004451ca41304510f164) (cherry picked from commit 3b3481180be9878d8837f49b77cd76284cc11221) (cherry picked from commit a64625b52b974ab961b89bce5dc0ea426f042924) --- modules/call_control/call_control.c | 2 +- modules/mediaproxy/mediaproxy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/call_control/call_control.c b/modules/call_control/call_control.c index 62af9244f81..5450e0055c1 100644 --- a/modules/call_control/call_control.c +++ b/modules/call_control/call_control.c @@ -985,7 +985,7 @@ __dialog_ended(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) if( !msg || msg == FAKED_REPLY) msg = _params->req; call_control_stop(msg, dlg->callid); - *_params->param = (void*)CCInactive; + *_params->param = NULL; } } diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index 3bca16d160d..df338b915c9 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -1926,7 +1926,7 @@ __dialog_ended(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { if ((int)(long)*_params->param == MPActive) { end_media_session(dlg->callid, dlg->tag[DLG_CALLER_LEG], dlg->tag[DLG_CALLEE_LEG]); - *_params->param = MPInactive; + *_params->param = NULL; } }