[NFC] Removed build warnings.

[Verification] Code compiles.

Change-Id: I2cdfdc05244016321994228aeee3c0609fe074d1
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>

diff --git a/src/nfc/nfc_adapter.cc b/src/nfc/nfc_adapter.cc
index 55d2f28..e121c7c 100644 (file)
--- a/src/nfc/nfc_adapter.cc
+++ b/src/nfc/nfc_adapter.cc
@@ -282,12 +282,12 @@ static void transaction_event_callback(nfc_se_type_e type,
   picojson::array& data_array = response_obj.insert(std::make_pair(JSON_DATA,
                                                                    picojson::value(picojson::array()))).first->second.get<picojson::array>();
 
-  for (unsigned int i = 0; i < aid_size; i++) {
+  for (ssize_t i = 0; i < aid_size; i++) {
     aid_array.push_back(picojson::value(static_cast<double>(_aid[i])));
   }
 
-  for (unsigned int i = 0; i < param_size; i++) {
-    aid_array.push_back(picojson::value(static_cast<double>(param[i])));
+  for (ssize_t i = 0; i < param_size; i++) {
+    data_array.push_back(picojson::value(static_cast<double>(param[i])));
   }
 
   if (NFC_SE_TYPE_ESE == type) {

diff --git a/src/nfc/nfc_message_utils.cc b/src/nfc/nfc_message_utils.cc
index 80e1c83..5494b22 100644 (file)
--- a/src/nfc/nfc_message_utils.cc
+++ b/src/nfc/nfc_message_utils.cc
@@ -319,7 +319,7 @@ PlatformResult NFCMessageUtils::ReportNDEFMessage(const picojson::value& args, p
 
   std::unique_ptr<unsigned char[]> data(new unsigned char[size]);
 
-  for (size_t i = 0; i < size; i++) {
+  for (ssize_t i = 0; i < size; i++) {
     data[i] = static_cast<unsigned char>(raw_data[i].get<double>());
   }
 
@@ -339,21 +339,21 @@ static PlatformResult NdefRecordGetHandle(picojson::value& record,
   nfc_record_tnf_e tnf = static_cast<nfc_record_tnf_e>(tnf_from_json);
   const picojson::array& type_data =
       FromJson<picojson::array>(record_obj, "type");
-  int type_size = type_data.size();
+  auto type_size = type_data.size();
   std::unique_ptr<unsigned char[]> type(new unsigned char[type_size]);
   for (size_t i = 0; i < type_size; i++) {
     type[i] = static_cast<unsigned char>(type_data[i].get<double>());
   }
   const picojson::array& id_data =
       FromJson<picojson::array>(record_obj, "id");
-  int id_size = id_data.size();
+  auto id_size = id_data.size();
   std::unique_ptr<unsigned char[]> id(new unsigned char[id_size]);
   for (size_t i = 0; i < id_size; i++) {
     id[i] = static_cast<unsigned char>(id_data[i].get<double>());
   }
   const picojson::array& payload_data =
       FromJson<picojson::array>(record_obj, "payload");
-  int payload_size = payload_data.size();
+  auto payload_size = payload_data.size();
   std::unique_ptr<unsigned char[]> payload(new unsigned char[payload_size]);
   for (size_t i = 0; i < payload_size; i++) {
     payload[i] = static_cast<unsigned char>(payload_data[i].get<double>());
@@ -559,7 +559,7 @@ PlatformResult NFCMessageUtils::ReportNDEFRecord(const picojson::value& args, pi
 
   std::unique_ptr<unsigned char[]> data(new unsigned char[size]);
 
-  for (size_t i = 0; i < size; i++) {
+  for (ssize_t i = 0; i < size; i++) {
     data[i] = static_cast<unsigned char>(raw_data[i].get<double>());
   }
   nfc_ndef_message_h message_handle = NULL;
@@ -943,7 +943,7 @@ PlatformResult NFCMessageUtils::ReportNDEFRecordMedia(const picojson::value& arg
   const int size = static_cast<int>(args.get("dataSize").get<double>());
 
   std::unique_ptr<unsigned char[]> data(new unsigned char[size]);
-  for (size_t i = 0; i < size; i++) {
+  for (ssize_t i = 0; i < size; i++) {
     data[i] = static_cast<unsigned char>(raw_data[i].get<double>());
   }
 

diff --git a/src/nfc/nfc_util.cc b/src/nfc/nfc_util.cc
index f782311..6e1e0d0 100644 (file)
--- a/src/nfc/nfc_util.cc
+++ b/src/nfc/nfc_util.cc
@@ -383,7 +383,7 @@ picojson::array NFCUtil::FromUCharArray(unsigned char* array,
   LoggerD("Entered");
   picojson::array apdu_array;
   apdu_array.reserve(apdu_len);
-  for(int i = 0; i < apdu_len; ++i)
+  for(unsigned int i = 0; i < apdu_len; ++i)
     apdu_array.push_back(picojson::value(static_cast<double>(array[i])));
   return apdu_array;
 }