[SecureElement] Changes to remove warning

[Verification] Code compiles without error. Web - TCT r31 passrate 100%

Change-Id: Icbcd32b6d87e238214a357463dd471d30caf2f9a
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>

diff --git a/src/secureelement/secureelement_channel.cc b/src/secureelement/secureelement_channel.cc
index 463b47e..e7355d3 100644 (file)
--- a/src/secureelement/secureelement_channel.cc
+++ b/src/secureelement/secureelement_channel.cc
@@ -35,8 +35,9 @@ ByteArray SEChannel::transmit(const picojson::array& v_command) {
     LoggerD("Entered");
     ByteArray response;
     if ( m_channel_ptr) {
-        uint8_t* command = new uint8_t[v_command.size()];
-        for ( int i = 0; i < v_command.size(); i++) {
+        size_t v_command_size = v_command.size();
+        uint8_t* command = new uint8_t[v_command_size];
+        for (size_t i = 0; i < v_command_size; i++) {
             command[i] = (uint8_t) static_cast<long>(v_command[i].get<double>());
         }
         ByteArray ba_command(command, v_command.size());

diff --git a/src/secureelement/secureelement_instance.cc b/src/secureelement/secureelement_instance.cc
index 1ef2f0e..1860fcc 100644 (file)
--- a/src/secureelement/secureelement_instance.cc
+++ b/src/secureelement/secureelement_instance.cc
@@ -145,7 +145,8 @@ void SecureElementInstance::GetSelectResponse( const picojson::value& args, pico
     ByteArray select_response = seChannel.getSelectResponse();
     picojson::value result = picojson::value(picojson::array());
     picojson::array& arr = result.get<picojson::array>();
-    for ( int i = 0; i < select_response.size(); i++) {
+    size_t select_response_size = select_response.size();
+    for (size_t i = 0; i < select_response_size; i++) {
         arr.push_back(picojson::value(static_cast<double>(select_response[i])));
     }
     ReportSuccess( result, out);
@@ -290,7 +291,8 @@ void SecureElementInstance::GetATR( const picojson::value& args, picojson::objec
     ByteArray atr_result = seSession.getATR();
     picojson::value result = picojson::value(picojson::array());
     picojson::array& arr = result.get<picojson::array>();
-    for ( int i = 0; i < atr_result.size(); i++) {
+    size_t atr_result_size = atr_result.size();
+    for (size_t i = 0; i < atr_result_size; i++) {
         arr.push_back(picojson::value(static_cast<double>(atr_result[i])));
     }
     ReportSuccess( result, out);
@@ -336,7 +338,8 @@ void SecureElementInstance::Transmit( const picojson::value& args, picojson::obj
             ByteArray transmit_response = seChannel.transmit(v_command);
             picojson::value result = picojson::value(picojson::array());
             picojson::array& arr = result.get<picojson::array>();
-            for ( int i = 0; i < transmit_response.size(); i++) {
+            size_t transmit_response_size = transmit_response.size();
+            for (size_t i = 0; i < transmit_response_size; i++) {
                 arr.push_back(picojson::value(static_cast<double>(transmit_response[i])));
             }
             ReportSuccess( result, response->get<picojson::object>());

diff --git a/src/secureelement/secureelement_session.cc b/src/secureelement/secureelement_session.cc
index 922baf2..35fee11 100644 (file)
--- a/src/secureelement/secureelement_session.cc
+++ b/src/secureelement/secureelement_session.cc
@@ -28,8 +28,9 @@ namespace secureelement {
 picojson::value SESession::openBasicChannel(const picojson::array& v_aid) {
     LoggerD("Entered");
 
-    unsigned char* aid = new unsigned char[v_aid.size()];
-    for ( int i = 0; i < v_aid.size(); i++) {
+    size_t v_aid_size = v_aid.size();
+    unsigned char* aid = new unsigned char[v_aid_size];
+    for (size_t i = 0; i < v_aid_size; i++) {
         aid[i] = static_cast<unsigned char>(v_aid[i].get<double>());
     }
     ByteArray aid_byte_array( aid, (unsigned int) v_aid.size());
@@ -48,8 +49,9 @@ picojson::value SESession::openBasicChannel(const picojson::array& v_aid) {
 picojson::value SESession::openLogicalChannel(const picojson::array& v_aid) {
     LoggerD("Entered");
 
-    unsigned char* aid = new unsigned char[v_aid.size()];
-    for ( int i = 0; i < v_aid.size(); i++) {
+    size_t v_aid_size = v_aid.size();
+    unsigned char* aid = new unsigned char[v_aid_size];
+    for (size_t i = 0; i < v_aid_size; i++) {
         aid[i] = static_cast<unsigned char>(v_aid[i].get<double>());
     }
     ByteArray aid_byte_array( aid, (unsigned int) v_aid.size());