Browse Source

correcting signatures

COM-121
Volker Birk 6 years ago
parent
commit
df7baa8868
2 changed files with 4 additions and 6 deletions
  1. +3
    -5
      CpEpEngine.cpp
  2. +1
    -1
      CpEpEngine.h

+ 3
- 5
CpEpEngine.cpp View File

@ -987,14 +987,12 @@ PEP_STATUS CpEpEngine::messageToSend(void * obj, const message *msg)
return PEP_STATUS_OK;
}
PEP_STATUS CpEpEngine::showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner, sync_handshake_result *result)
PEP_STATUS CpEpEngine::showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner)
{
assert(self && partner);
if (!(self && partner))
return PEP_ILLEGAL_VALUE;
*result = SYNC_HANDSHAKE_CANCEL;
pEp_identity_s _self;
copy_identity(&_self, self);
pEp_identity_s _partner;
@ -1010,8 +1008,8 @@ PEP_STATUS CpEpEngine::showHandshake(void * obj, const pEp_identity *self, const
if (r != S_OK)
return PEP_UNKNOWN_ERROR;
*result = (sync_handshake_result) (int) _result;
return PEP_STATUS_OK;
PEP_STATUS status = deliverHandshakeResult(me->get_session(), (sync_handshake_result) (int) _result);
return status;
}
STDMETHODIMP CpEpEngine::blacklist_add(BSTR fpr)


+ 1
- 1
CpEpEngine.h View File

@ -110,7 +110,7 @@ protected:
typedef locked_queue<pEp_identity_cpp> identity_queue_t;
static ::pEp_identity * retrieve_next_identity(void *management);
static PEP_STATUS messageToSend(void *obj, const message *msg);
static PEP_STATUS showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner, sync_handshake_result *result);
static PEP_STATUS showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner);
HRESULT error(_bstr_t msg);


Loading…
Cancel
Save