From cb08017d9d15556d6ee1a8be415eea4a3b8ab3fe Mon Sep 17 00:00:00 2001 From: Roker Date: Wed, 18 Jan 2017 17:36:05 +0100 Subject: [PATCH] =?UTF-8?q?JSON-20=20Change=20the=20order=20of=202=20void*?= =?UTF-8?q?=20parameters=E2=80=A6=20*sigh*=20who=20designed=20such=20inter?= =?UTF-8?q?faces=3F=20=E2=80=93.=E2=80=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/json-adapter.cc | 3 ++- server/json-adapter.hh | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/json-adapter.cc b/server/json-adapter.cc index c6ef2ab..cacbedc 100644 --- a/server/json-adapter.cc +++ b/server/json-adapter.cc @@ -578,7 +578,8 @@ PEP_STATUS JsonAdapter::notifyHandshake(void* obj, pEp_identity* self, pEp_ident } -int JsonAdapter::injectSyncMsg(void* obj, void* msg) +// BEWARE: msg is 1st parameter, obj is second!!! +int JsonAdapter::injectSyncMsg(void* msg, void* obj) { JsonAdapter* ja = static_cast(obj); return ja->i->injectSyncMsg(msg); diff --git a/server/json-adapter.hh b/server/json-adapter.hh index 32c9da9..8bf53bf 100644 --- a/server/json-adapter.hh +++ b/server/json-adapter.hh @@ -54,7 +54,9 @@ public: static PEP_STATUS messageToSend(void* obj, message* msg); static PEP_STATUS notifyHandshake(void* obj, pEp_identity* self, pEp_identity* partner, sync_handshake_signal signal); - static int injectSyncMsg(void* obj, void* msg); + + // BEWARE: msg is 1st parameter, obj is second!!! + static int injectSyncMsg(void* msg void* obj); static void *retrieveNextSyncMsg(void* obj, time_t* timeout); static void *syncThreadRoutine(void* arg);