From ec11864066e50e8f282bcce7e26aead5090037d7 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 22 Aug 2014 17:57:45 +0200 Subject: [PATCH] Remove duplicated user pointer. --- coreapi/linphonecall.c | 13 ++++++------- coreapi/private.h | 1 - 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index d34d88f3b..c643a3e03 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -1179,27 +1179,26 @@ const LinphoneErrorInfo *linphone_call_get_error_info(const LinphoneCall *call){ } /** - * Get the user_pointer in the LinphoneCall + * Get the user pointer associated with the LinphoneCall * * @ingroup call_control - * - * return user_pointer an opaque user pointer that can be retrieved at any time + * @return an opaque user pointer that can be retrieved at any time **/ void *linphone_call_get_user_data(const LinphoneCall *call) { - return call->user_pointer; + return call->user_data; } /** - * Set the user_pointer in the LinphoneCall + * Set the user pointer associated with the LinphoneCall * * @ingroup call_control * - * the user_pointer is an opaque user pointer that can be retrieved at any time in the LinphoneCall + * the user pointer is an opaque user pointer that can be retrieved at any time in the LinphoneCall **/ void linphone_call_set_user_data(LinphoneCall *call, void *user_pointer) { - call->user_pointer = user_pointer; + call->user_data = user_pointer; } /** diff --git a/coreapi/private.h b/coreapi/private.h index 4f6967ef0..97ddf8b1b 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -201,7 +201,6 @@ struct _LinphoneCall LinphoneCallState prevstate; LinphoneCallState transfer_state; /*idle if no transfer*/ LinphoneProxyConfig *dest_proxy; - void * user_pointer; PortConfig media_ports[2]; MSMediaStreamSessions sessions[2]; /*the rtp, srtp, zrtp contexts for each stream*/ StunCandidate ac,vc; /*audio video ip/port discovered by STUN*/