Rename parameter in ExportKey
authorDean
Mon, 10 Oct 2016 09:54:22 +0200
changeset 1841a2c49263cba
parent 183 2e8f481ec4f4
child 185 0810c1e2c634
Rename parameter in ExportKey
CpEpEngine.cpp
CpEpEngine.h
pEpCOMServerAdapter.idl
     1.1 --- a/CpEpEngine.cpp	Mon Oct 10 09:21:06 2016 +0200
     1.2 +++ b/CpEpEngine.cpp	Mon Oct 10 09:54:22 2016 +0200
     1.3 @@ -43,12 +43,12 @@
     1.4  	return S_OK;
     1.5  }
     1.6  
     1.7 -STDMETHODIMP CpEpEngine::ExportKey(BSTR fpr, BSTR * key_data)
     1.8 +STDMETHODIMP CpEpEngine::ExportKey(BSTR fpr, BSTR * keyData)
     1.9  {
    1.10      assert(fpr);
    1.11      assert(key_data);
    1.12  
    1.13 -    if (fpr == NULL || key_data == NULL)
    1.14 +    if (fpr == NULL || keyData == NULL)
    1.15          return E_INVALIDARG;
    1.16  
    1.17      string _fpr = utf8_string(fpr);
    1.18 @@ -65,7 +65,7 @@
    1.19  
    1.20      _bstr_t b_key_data(utf16_string(_key_data).c_str());
    1.21      pEp_free(_key_data);
    1.22 -    * key_data = b_key_data.Detach();
    1.23 +    * keyData = b_key_data.Detach();
    1.24  
    1.25      return S_OK;
    1.26  }
     2.1 --- a/CpEpEngine.h	Mon Oct 10 09:21:06 2016 +0200
     2.2 +++ b/CpEpEngine.h	Mon Oct 10 09:54:22 2016 +0200
     2.3 @@ -181,7 +181,7 @@
     2.4  
     2.5      // basic API
     2.6  
     2.7 -    STDMETHOD(ExportKey)(BSTR fpr, BSTR * key_data);
     2.8 +    STDMETHOD(ExportKey)(BSTR fpr, BSTR * keyData);
     2.9      STDMETHOD(Log)(BSTR title, BSTR entity, BSTR description, BSTR comment);
    2.10      STDMETHOD(TrustWords)(BSTR fpr, BSTR lang, LONG max_words, BSTR * words);
    2.11      STDMETHOD(GetCrashdumpLog)(LONG maxlines, BSTR * log);
     3.1 --- a/pEpCOMServerAdapter.idl	Mon Oct 10 09:21:06 2016 +0200
     3.2 +++ b/pEpCOMServerAdapter.idl	Mon Oct 10 09:54:22 2016 +0200
     3.3 @@ -47,7 +47,7 @@
     3.4  
     3.5      // basic API
     3.6  
     3.7 -    HRESULT ExportKey([in] BSTR fpr, [out, retval] BSTR * key_data);
     3.8 +    HRESULT ExportKey([in] BSTR fpr, [out, retval] BSTR * keyData);
     3.9      HRESULT Log([in] BSTR title, [in] BSTR entity, [in, defaultvalue("")] BSTR description, [in, defaultvalue("")] BSTR comment);
    3.10      HRESULT TrustWords([in] BSTR fpr, [in, defaultvalue("en")] BSTR lang, [in, defaultvalue(0)] LONG maxWords, [out, retval] BSTR * words);
    3.11      HRESULT GetCrashdumpLog([in, defaultvalue(0)] LONG maxlines, [out, retval] BSTR * log);