diff options
| author | Krzysztof Jackiewicz <k.jackiewicz@samsung.com> | 2014-09-26 10:33:53 +0200 |
|---|---|---|
| committer | Krzysztof Jackiewicz <k.jackiewicz@samsung.com> | 2014-09-26 15:17:31 +0200 |
| commit | 6a24f01ecd8b0f13b821b8ffe35a65275fe8ab5a (patch) | |
| tree | 2d2d02123dc4fe271b337d710725457b7d14fcd6 | |
| parent | 2ad243af50ef1d9a1304c6f96130d481489cc827 (diff) | |
| download | key-manager-tizen_3.0.m14.3_ivi.tar.gz key-manager-tizen_3.0.m14.3_ivi.tar.bz2 key-manager-tizen_3.0.m14.3_ivi.zip | |
Fix buildbreak on wayland x86_64tizen_3.0.m14.3_ivi_releasetizen_3.0.2014.q3_common_releasesubmit/tizen_mobile/20141120.000000submit/tizen/20140926.142609accepted/tizen/ivi/20141006.083203accepted/tizen/common/20140926.144326tizen_3.0.m14.3_ivitizen_3.0.2014.q3_commonaccepted/tizen_3.0.m14.3_iviaccepted/tizen_3.0.2014.q3_common
Change-Id: Id9ad5da78b5bee5bd1c15870c7857eb311ed1113
| -rw-r--r-- | src/manager/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/manager/client/client-common.cpp | 2 | ||||
| -rw-r--r-- | src/manager/common/base64.cpp | 2 | ||||
| -rw-r--r-- | src/manager/common/key-impl.cpp | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt index 5dfbc78f..817583ab 100644 --- a/src/manager/CMakeLists.txt +++ b/src/manager/CMakeLists.txt @@ -68,4 +68,4 @@ TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_COMMON} ################################################################################ -INSTALL(TARGETS ${TARGET_KEY_MANAGER_COMMON} DESTINATION lib) +INSTALL(TARGETS ${TARGET_KEY_MANAGER_COMMON} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/src/manager/client/client-common.cpp b/src/manager/client/client-common.cpp index a05f7e3b..aeb79cd2 100644 --- a/src/manager/client/client-common.cpp +++ b/src/manager/client/client-common.cpp @@ -116,7 +116,7 @@ int connectSocket(int& sock, char const * const interface) { return CKM_API_ERROR_SOCKET; } int error = 0; - size_t len = sizeof(error); + socklen_t len = sizeof(error); retval = getsockopt(sock, SOL_SOCKET, SO_ERROR, &error, &len); if (-1 == retval) { diff --git a/src/manager/common/base64.cpp b/src/manager/common/base64.cpp index 1be549b6..f1845057 100644 --- a/src/manager/common/base64.cpp +++ b/src/manager/common/base64.cpp @@ -54,7 +54,7 @@ void Base64Encoder::finalize() ThrowMsg(Exception::AlreadyFinalized, "Already finalized."); } m_finalized = true; - BIO_flush(m_b64); + (void)BIO_flush(m_b64); } RawBuffer Base64Encoder::get() diff --git a/src/manager/common/key-impl.cpp b/src/manager/common/key-impl.cpp index ceb6ef0f..79d248b7 100644 --- a/src/manager/common/key-impl.cpp +++ b/src/manager/common/key-impl.cpp @@ -117,7 +117,7 @@ KeyImpl::KeyImpl(const RawBuffer &buf, const Password &password) } if (!pkey && buf[0] != '-') { - BIO_reset(bio.get()); + (void)BIO_reset(bio.get()); BIO_write(bio.get(), buf.data(), buf.size()); pkey = d2i_PrivateKey_bio(bio.get(), NULL); isPrivate = true; @@ -125,7 +125,7 @@ KeyImpl::KeyImpl(const RawBuffer &buf, const Password &password) } if (!pkey && buf[0] == '-') { - BIO_reset(bio.get()); + (void)BIO_reset(bio.get()); BIO_write(bio.get(), buf.data(), buf.size()); pkey = PEM_read_bio_PUBKEY(bio.get(), NULL, passcb, const_cast<Password*>(&password)); isPrivate = false; @@ -133,7 +133,7 @@ KeyImpl::KeyImpl(const RawBuffer &buf, const Password &password) } if (!pkey && buf[0] == '-') { - BIO_reset(bio.get()); + (void)BIO_reset(bio.get()); BIO_write(bio.get(), buf.data(), buf.size()); pkey = PEM_read_bio_PrivateKey(bio.get(), NULL, passcb, const_cast<Password*>(&password)); isPrivate = true; |