From b3d868015050b81d2a0044964dc4048bcd756a4f Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 15 Sep 2017 12:03:18 +0200 Subject: [PATCH] No longer include a userData field in the C clonable structs. --- src/c-wrapper/api/c-call-params.cpp | 6 +++--- src/c-wrapper/c-tools.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/c-wrapper/api/c-call-params.cpp b/src/c-wrapper/api/c-call-params.cpp index ead25cae9..13d515655 100644 --- a/src/c-wrapper/api/c-call-params.cpp +++ b/src/c-wrapper/api/c-call-params.cpp @@ -492,12 +492,12 @@ void linphone_call_params_set_no_user_consent(LinphoneCallParams *params, bool_t * Reference and user data handling functions * ******************************************************************************/ -void *linphone_call_params_get_user_data(const LinphoneCallParams *cp) { - return cp->userData; +void * linphone_call_params_get_user_data(const LinphoneCallParams *cp) { + return L_GET_USER_DATA_FROM_C_STRUCT(cp, MediaSessionParams, CallParams); } void linphone_call_params_set_user_data(LinphoneCallParams *cp, void *ud) { - cp->userData = ud; + L_SET_USER_DATA_FROM_C_STRUCT(cp, ud, MediaSessionParams, CallParams); } LinphoneCallParams * linphone_call_params_ref(LinphoneCallParams *cp) { diff --git a/src/c-wrapper/c-tools.h b/src/c-wrapper/c-tools.h index 7b50db728..a5300446d 100644 --- a/src/c-wrapper/c-tools.h +++ b/src/c-wrapper/c-tools.h @@ -42,7 +42,6 @@ private: template struct WrappedClonableObject { belle_sip_object_t base; - void *userData; T *cppPtr; }; @@ -271,7 +270,6 @@ LINPHONE_END_NAMESPACE #define L_DECLARE_C_CLONABLE_STRUCT_IMPL(CPP_CLASS, C_STRUCT, C_NAME, ...) \ struct _Linphone ## C_STRUCT { \ belle_sip_object_t base; \ - void *userData; \ LINPHONE_NAMESPACE::CPP_CLASS *cppPtr; \ __VA_ARGS__ \ }; \