Apply coding rule

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

diff --git a/common/PKCS15DODF.cpp b/common/PKCS15DODF.cpp
index 86514c7..0ec55c0 100644 (file)
--- a/common/PKCS15DODF.cpp
+++ b/common/PKCS15DODF.cpp
@@ -30,25 +30,19 @@ namespace smartcard_service_api
        {
                int ret = 0;
 
-               if ((ret = select(fid)) >= SCARD_ERROR_OK)
-               {
+               if ((ret = select(fid)) >= SCARD_ERROR_OK) {
                        ByteArray dodfData, extra;
 
                        _DBG("response : %s", selectResponse.toString().c_str());
 
-                       if ((ret = readBinary(0, 0, getFCP()->getFileSize(), dodfData)) == 0)
-                       {
-                               _DBG("odfData : %s", dodfData.toString().c_str());
+                       if ((ret = readBinaryAll(0, dodfData)) == 0) {
+                               _DBG("dodfData : %s", dodfData.toString().c_str());
 
                                parseData(dodfData);
-                       }
-                       else
-                       {
+                       } else {
                                _ERR("readBinary failed, [%d]", ret);
                        }
-               }
-               else
-               {
+               } else {
                        _ERR("select failed, [%d]", ret);
                }
        }
@@ -58,25 +52,19 @@ namespace smartcard_service_api
        {
                int ret = 0;
 
-               if ((ret = select(path)) >= SCARD_ERROR_OK)
-               {
+               if ((ret = select(path)) >= SCARD_ERROR_OK) {
                        ByteArray dodfData, extra;
 
                        _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());
 
                                parseData(dodfData);
-                       }
-                       else
-                       {
+                       } else {
                                _ERR("readBinary failed, [%d]", ret);
                        }
-               }
-               else
-               {
+               } else {
                        _ERR("select failed, [%d]", ret);
                }
        }
@@ -90,10 +78,8 @@ namespace smartcard_service_api
                bool result = false;
                SimpleTLV tlv(data);
 
-               while (tlv.decodeTLV())
-               {
-                       switch (tlv.getTag())
-                       {
+               while (tlv.decodeTLV()) {
+                       switch (tlv.getTag()) {
                        case (unsigned int)0xA1 : /* CHOICE 1 : OidDO */
                                {
                                        PKCS15OID oid(tlv.getValue());
@@ -121,8 +107,7 @@ namespace smartcard_service_api
                map<ByteArray, PKCS15OID>::const_iterator item;
 
                item = mapOID.find(oid);
-               if (item != mapOID.end())
-               {
+               if (item != mapOID.end()) {
                        data = item->second.getPath();
                        result = 0;
                }