Removed warning for BT, NFC

Change-Id: I6347d278ccbf0bd6874ea39ef7f313fe74721b9e
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5139
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c
index 8087953..0b2b1e7 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c
@@ -943,7 +943,7 @@ CAResult_t CAEDRNativeSendData(JNIEnv *env, const char *address, const uint8_t *
                 return CA_STATUS_FAILED;
             }
 
-            OIC_LOG_V(INFO, TAG, "EDR sendTo is successful: %ld bytes, to %s",
+            OIC_LOG_V(INFO, TAG, "EDR sendTo is successful: %u bytes, to %s",
                       dataLength, address);
         }
         else

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c
index befca2c..ad36e2f 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c
@@ -163,7 +163,7 @@ static void CAReceiveHandler(void *data)
         {
             for (uint32_t idx = 0; idx < length; idx++)
             {
-                CAEDRNativeReadData(env, idx, ctx->type);
+                CAEDRNativeReadData(env, idx);
             }
         }
     }
@@ -639,7 +639,7 @@ CAResult_t CAEDRStopMulticastServer()
     return CA_STATUS_OK;
 }
 
-CAResult_t CAEDRNativeReadData(JNIEnv *env, uint32_t id, CAAdapterServerType_t type)
+CAResult_t CAEDRNativeReadData(JNIEnv *env, uint32_t id)
 {
     if ((*env)->ExceptionCheck(env))
     {

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h
index 06ee1d7..43edafa 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h
@@ -78,10 +78,9 @@ CAResult_t CAEDRStopMulticastServer();
  * This function will read the data from remote device.
  * @param[in]  env              JNI interface pointer.
  * @param[in]  id               index of remote address.
- * @param[in]  type             EDR server type.
  * @return ::CA_STATUS_OK or Appropriate error code.
  */
-CAResult_t CAEDRNativeReadData(JNIEnv *env, uint32_t id, CAAdapterServerType_t type);
+CAResult_t CAEDRNativeReadData(JNIEnv *env, uint32_t id);
 
 /**
  * Start Listen Task.

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/caedradapter.c b/resource/csdk/connectivity/src/bt_edr_adapter/caedradapter.c
index 2f9296a..752e893 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/caedradapter.c
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/caedradapter.c
@@ -583,7 +583,10 @@ void CAAdapterDataReceiverHandler(void *context)
                                                           0);
 
     OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "Sending data up !");
-    g_networkPacketReceivedCallback(remoteEndpoint, message->data, message->dataLen);
+
+    const CASecureEndpoint_t sep = { .endpoint = *remoteEndpoint };
+
+    g_networkPacketReceivedCallback(&sep, message->data, message->dataLen);
 
     CAFreeEndpoint(remoteEndpoint);
 

diff --git a/resource/csdk/connectivity/src/nfc_adapter/canfcadapter.c b/resource/csdk/connectivity/src/nfc_adapter/canfcadapter.c
index 909d30f..cc34caa 100644 (file)
--- a/resource/csdk/connectivity/src/nfc_adapter/canfcadapter.c
+++ b/resource/csdk/connectivity/src/nfc_adapter/canfcadapter.c
@@ -132,6 +132,9 @@ void CANFCDeinitializeQueueHandles()
 void CANFCConnectionStateCB(const char *nfcAddress, CANetworkStatus_t status)
 {
     OIC_LOG(DEBUG, TAG, "Currently Not Supported");
+
+    (void)nfcAddress;
+    (void)status;
 }
 
 void CANFCPacketReceivedCB(const CASecureEndpoint_t *sep, const void *data, uint32_t dataLength)
@@ -402,6 +405,7 @@ void CANFCDataDestroyer(void *data, uint32_t size)
     CANFCData *nfcData = (CANFCData *) data;
 
     CAFreeNFCData(nfcData);
+    (void)size;
 }
 
 CAResult_t CAGetNFCInterfaceInformation(CAEndpoint_t **info, uint32_t *size)