From 2ee34d3a0acfd5782c0b33345e8143545b4d6cfe Mon Sep 17 00:00:00 2001 From: Woowon Date: Tue, 9 Apr 2013 12:00:20 +0900 Subject: [PATCH] Remove dlopen code Change-Id: I66a4b71be1f740f064a4539b4e10c119bccd7278 Signed-off-by: Woowon --- src/FNetNfc_NfcManagerImpl.cpp | 19 ------------------- src/FNetNfc_NfcSystemAdapter.cpp | 32 -------------------------------- src/FNetNfc_NfcSystemAdapter.h | 12 ------------ 3 files changed, 63 deletions(-) diff --git a/src/FNetNfc_NfcManagerImpl.cpp b/src/FNetNfc_NfcManagerImpl.cpp index fd4e10f..e8527cd 100644 --- a/src/FNetNfc_NfcManagerImpl.cpp +++ b/src/FNetNfc_NfcManagerImpl.cpp @@ -1121,22 +1121,3 @@ _NfcManagerImpl::PrintTag(const _NfcTagImpl& tag) const } } } } // Tizen::Net::Nfc - - -#ifdef __cplusplus -extern "C" -{ -#endif - -_OSP_EXPORT_ ByteBuffer* -_NfcManagerImpl_GetCachedByteBufferMessageN(void) -{ - Tizen::Net::Nfc::_NfcSystemAdapter* __pSystemAdapter = Tizen::Net::Nfc::_NfcSystemAdapter::GetInstance(); - SysTryReturn(NID_NET_NFC, __pSystemAdapter != null, null, E_SYSTEM, "Failed to get the instance of _NfcSystemAdapter."); - - return __pSystemAdapter->GetCachedByteBufferMessageN(); -} - -#ifdef __cplusplus -} -#endif diff --git a/src/FNetNfc_NfcSystemAdapter.cpp b/src/FNetNfc_NfcSystemAdapter.cpp index a442c57..9280b5c 100644 --- a/src/FNetNfc_NfcSystemAdapter.cpp +++ b/src/FNetNfc_NfcSystemAdapter.cpp @@ -883,38 +883,6 @@ _NfcSystemAdapter::GetNdefMessageN(const nfc_ndef_message_h& messageHandle) return _NdefMessageUtil::ToNdefMessageN(byteMessage); } -ByteBuffer* -_NfcSystemAdapter::GetCachedByteBufferMessageN(void) -{ - int res = NFC_ERROR_NONE; - result r = E_SUCCESS; - nfc_ndef_message_h msgHandle = null; - byte* pTempBuffer = null; - int bufSize = 0; - - res = nfc_manager_get_cached_message(&msgHandle); - _NfcConvertErrorResult(res != NFC_ERROR_NONE, r, E_SYSTEM); - _NfcConvertErrorResult(res == NFC_ERROR_OUT_OF_MEMORY, r, E_OUT_OF_MEMORY); - _NfcConvertErrorResult(res == NFC_ERROR_INVALID_NDEF_MESSAGE, r, E_INVALID_FORMAT); - SysTryReturn(NID_NET_NFC, r == E_SUCCESS, null, r, - "[%s] Failed to get the cached NDEF message. [0x%08X]", GetErrorMessage(r), res); - - res = nfc_ndef_message_get_rawdata(msgHandle, &pTempBuffer, &bufSize); - nfc_ndef_message_destroy(msgHandle); - _NfcConvertErrorResult(pTempBuffer == NULL || res != NFC_ERROR_NONE, r, E_SYSTEM); - _NfcConvertErrorResult(res == NFC_ERROR_INVALID_NDEF_MESSAGE, r, E_INVALID_FORMAT); - _NfcConvertErrorResult(res == NFC_ERROR_OUT_OF_MEMORY, r, E_OUT_OF_MEMORY); - SysTryReturn(NID_NET_NFC, r == E_SUCCESS, null, r, - "[%s] Failed to get the raw data of the NDEF message. [0x%08X]", GetErrorMessage(r), res); - - ByteBuffer* byteMessage = new (std::nothrow) ByteBuffer(); - SysTryReturn(NID_NET_NFC, byteMessage != null, null, r, "[%s] Memory allocation failed.", GetErrorMessage(r)); - - byteMessage->Construct(pTempBuffer, 0, bufSize, bufSize); - - return byteMessage; -} - _NfcTagImpl* _NfcSystemAdapter::GetNfcTagImplN(nfc_tag_h tagHandle) { diff --git a/src/FNetNfc_NfcSystemAdapter.h b/src/FNetNfc_NfcSystemAdapter.h index 0ed7b7a..a8de5d3 100644 --- a/src/FNetNfc_NfcSystemAdapter.h +++ b/src/FNetNfc_NfcSystemAdapter.h @@ -348,18 +348,6 @@ public: */ static NdefMessage* GetCachedNdefMessageN(void); - /** - * Gets the ByteBuffer message cached when the tag is detected. - * - * @return The cached %ByteBuffer instance, @n - * else @c null if the method is not successful - * @exception E_SUCCESS The method is successful. - * @exception E_INVALID_FORMAT The cached data cannot be converted to the ByteBuffer message. - * @exception E_OUT_OF_MEMORY The memory is insufficient. - * @exception E_SYSTEM A system error has occurred. - */ - Tizen::Base::ByteBuffer* GetCachedByteBufferMessageN(void); - private: _NfcSystemAdapter(void); _NfcSystemAdapter(const _NfcSystemAdapter& value); -- 2.7.4