correcting signatures
authorVolker Birk <vb@pep-project.org>
Wed, 25 May 2016 13:04:50 +0200
changeset 839b7371990473
parent 82 29ea9f52055d
child 84 ec2e6174b307
child 86 e18b34f4b9cc
child 102 abdd404b62e0
correcting signatures
CpEpEngine.cpp
CpEpEngine.h
     1.1 --- a/CpEpEngine.cpp	Thu May 12 01:05:47 2016 +0200
     1.2 +++ b/CpEpEngine.cpp	Wed May 25 13:04:50 2016 +0200
     1.3 @@ -987,14 +987,12 @@
     1.4      return PEP_STATUS_OK;
     1.5  }
     1.6  
     1.7 -PEP_STATUS CpEpEngine::showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner, sync_handshake_result *result)
     1.8 +PEP_STATUS CpEpEngine::showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner)
     1.9  {
    1.10      assert(self && partner);
    1.11      if (!(self && partner))
    1.12          return PEP_ILLEGAL_VALUE;
    1.13  
    1.14 -    *result = SYNC_HANDSHAKE_CANCEL;
    1.15 -
    1.16      pEp_identity_s _self;
    1.17      copy_identity(&_self, self);
    1.18      pEp_identity_s _partner;
    1.19 @@ -1010,8 +1008,8 @@
    1.20      if (r != S_OK)
    1.21          return PEP_UNKNOWN_ERROR;
    1.22  
    1.23 -    *result = (sync_handshake_result) (int) _result;
    1.24 -    return PEP_STATUS_OK;
    1.25 +    PEP_STATUS status = deliverHandshakeResult(me->get_session(), (sync_handshake_result) (int) _result);
    1.26 +    return status;
    1.27  }
    1.28  
    1.29  STDMETHODIMP CpEpEngine::blacklist_add(BSTR fpr)
     2.1 --- a/CpEpEngine.h	Thu May 12 01:05:47 2016 +0200
     2.2 +++ b/CpEpEngine.h	Wed May 25 13:04:50 2016 +0200
     2.3 @@ -110,7 +110,7 @@
     2.4      typedef locked_queue<pEp_identity_cpp> identity_queue_t;
     2.5      static ::pEp_identity * retrieve_next_identity(void *management);
     2.6      static PEP_STATUS messageToSend(void *obj, const message *msg);
     2.7 -    static PEP_STATUS showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner, sync_handshake_result *result);
     2.8 +    static PEP_STATUS showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner);
     2.9  
    2.10      HRESULT error(_bstr_t msg);
    2.11