Apply tizen 2.4 smartcard-service

[platform/core/connectivity/smartcard-service.git] / common / PKCS15DODF.cpp

diff --git a/common/PKCS15DODF.cpp b/common/PKCS15DODF.cpp
index 9177a02..ea1cde6 100644 (file)
--- a/common/PKCS15DODF.cpp
+++ b/common/PKCS15DODF.cpp
@@ -36,9 +36,9 @@ namespace smartcard_service_api
 
                        _DBG("response : %s", selectResponse.toString().c_str());
 
-                       if ((ret = readBinary(0, 0, getFCP()->getFileSize(), dodfData)) == 0)
+                       if ((ret = readBinaryAll(0, dodfData)) == 0)
                        {
-                               _DBG("odfData : %s", dodfData.toString().c_str());
+                               _DBG("dodfData : %s", dodfData.toString().c_str());
 
                                parseData(dodfData);
                        }
@@ -64,7 +64,7 @@ namespace smartcard_service_api
 
                        _DBG("response : %s", selectResponse.toString().c_str());
 
-                       if ((ret = readBinary(0, 0, getFCP()->getFileSize(), dodfData)) == 0)
+                       if ((ret = readBinaryAll(0, dodfData)) == 0)
                        {
                                _DBG("dodfData : %s", dodfData.toString().c_str());
 
@@ -98,10 +98,9 @@ namespace smartcard_service_api
                                {
                                        PKCS15OID oid(tlv.getValue());
 
-                                       _DBG("OID DataObject");
+                                       _DBG("OID DataObject : %s", oid.getOID().toString().c_str());
 
-                                       pair<ByteArray, PKCS15OID> newPair(oid.getOID(), oid);
-                                       mapOID.insert(newPair);
+                                       mapOID.insert(make_pair(oid.getOID(), oid));
                                }
                                break;