From ba42680d6792fde34cc78ededcc95d5558415ff8 Mon Sep 17 00:00:00 2001 From: "saerome.kim" Date: Fri, 21 Dec 2018 14:09:46 +0900 Subject: [PATCH] Fixed build errors due to dlog update Change-Id: I0f4adc204f57a93f264ff80ad5944a064156c59b Signed-off-by: saerome.kim --- common/APDUHelper.cpp | 2 +- common/AccessControlList.cpp | 4 ++-- common/ByteArray.cpp | 12 ++++++------ common/FileObject.cpp | 14 +++++++------- common/GPARAACL.cpp | 2 +- common/GPARAM.cpp | 10 +++++----- common/PKCS15CDF.cpp | 6 +++--- common/PKCS15DODF.cpp | 2 +- common/PKCS15ODF.cpp | 6 +++--- common/SignatureHelper.cpp | 4 ++-- packaging/smartcard-service.spec | 2 +- server/ServerChannel.cpp | 6 +++--- server/ServerGDBus.cpp | 8 ++++---- server/ServerResource.cpp | 8 ++++---- server/ServerSession.cpp | 0 server/ServiceInstance.cpp | 0 server/private/AccessControl.cpp | 0 server/private/PKCS15CDFACL.cpp | 2 +- server/smartcard-daemon.cpp | 0 19 files changed, 44 insertions(+), 44 deletions(-) mode change 100755 => 100644 server/ServerGDBus.cpp mode change 100755 => 100644 server/ServerSession.cpp mode change 100755 => 100644 server/ServiceInstance.cpp mode change 100644 => 100755 server/private/AccessControl.cpp mode change 100644 => 100755 server/private/PKCS15CDFACL.cpp mode change 100755 => 100644 server/smartcard-daemon.cpp diff --git a/common/APDUHelper.cpp b/common/APDUHelper.cpp index 528a5af..4d5c72a 100644 --- a/common/APDUHelper.cpp +++ b/common/APDUHelper.cpp @@ -272,7 +272,7 @@ namespace smartcard_service_api if (command.size() == offset) { result = true; } else { - _ERR("command stream is not correct, command.size() [%d], offset [%d]", command.size(), offset); + _ERR("command stream is not correct, command.size() [%zu], offset [%d]", command.size(), offset); } return result; diff --git a/common/AccessControlList.cpp b/common/AccessControlList.cpp index 5a5e6e7..bbe1fdf 100644 --- a/common/AccessControlList.cpp +++ b/common/AccessControlList.cpp @@ -175,7 +175,7 @@ namespace smartcard_service_api _INFO("no rule found, aid [%s]", aid.toString().c_str()); for (i = 0; i < certHashes.size(); i++) { - _INFO(" hash[%d] [%s]", i, certHashes[i].toString().c_str()); + _INFO(" hash[%zu] [%s]", i, certHashes[i].toString().c_str()); } END : @@ -234,7 +234,7 @@ END : _INFO("no rule found, aid [%s]", aid.toString().c_str()); for (i = 0; i < certHashes.size(); i++) { - _INFO(" hash[%d] [%s]", i, certHashes[i].toString().c_str()); + _INFO(" hash[%zu] [%s]", i, certHashes[i].toString().c_str()); } END : return result; diff --git a/common/ByteArray.cpp b/common/ByteArray.cpp index c307196..cd4e099 100644 --- a/common/ByteArray.cpp +++ b/common/ByteArray.cpp @@ -112,7 +112,7 @@ namespace smartcard_service_api if (offset >= length) { - _ERR("buffer overflow, offset [%d], length [%d]", offset, length); + _ERR("buffer overflow, offset [%zu], length [%zu]", offset, length); return NULL; } @@ -126,7 +126,7 @@ namespace smartcard_service_api if (offset >= length) { - _ERR("buffer overflow, offset [%d], length [%d]", offset, length); + _ERR("buffer overflow, offset [%zu], length [%zu]", offset, length); return NULL; } @@ -137,7 +137,7 @@ namespace smartcard_service_api { if (index >= length) { - _ERR("buffer overflow, index [%d], length [%d]", index, length); + _ERR("buffer overflow, index [%zu], length [%zu]", index, length); if (length > 0) { return buffer[length - 1]; } else { @@ -152,7 +152,7 @@ namespace smartcard_service_api { if (index >= length) { - _ERR("buffer underflow, index [%d], length [%d]", index, length); + _ERR("buffer underflow, index [%zu], length [%zu]", index, length); if (length > 0) { return buffer[0]; } else { @@ -284,7 +284,7 @@ namespace smartcard_service_api { if (index >= length) { - _ERR("buffer overflow, index [%d], length [%d]", index, length); + _ERR("buffer overflow, index [%zu], length [%zu]", index, length); if (length > 0) { return buffer[length -1]; } else { @@ -354,7 +354,7 @@ namespace smartcard_service_api fflush(file); fclose(file); - SECURE_LOGD("file has written, file [%s], length[%d]", filePath, length); + SECURE_LOGD("file has written, file [%s], length[%zu]", filePath, length); } else { _ERR("file open failed, [%d]", errno); } diff --git a/common/FileObject.cpp b/common/FileObject.cpp index e140256..e7047a2 100644 --- a/common/FileObject.cpp +++ b/common/FileObject.cpp @@ -102,7 +102,7 @@ namespace smartcard_service_api setSelectResponse(result); } else { - _ERR("select apdu is failed, rv [%d], length [%d]", + _ERR("select apdu is failed, rv [%d], length [%zu]", ret, result.size()); ret = ERROR_ILLEGAL_STATE; @@ -199,14 +199,14 @@ namespace smartcard_service_api ret = resp.getStatus(); if (ret >= 0) { - _DBG("response [%d] : %s", response.size(), response.toString().c_str()); + _DBG("response [%zu] : %s", response.size(), response.toString().c_str()); result = Record(recordId, resp.getDataField()); } else { _ERR("status word [ %02X %02X ]", resp.getSW1(), resp.getSW2()); } } else { - _ERR("select apdu is failed, rv [%d], length [%d]", ret, response.size()); + _ERR("select apdu is failed, rv [%d], length [%zu]", ret, response.size()); } return ret; @@ -242,7 +242,7 @@ namespace smartcard_service_api ResponseHelper resp(response); if (resp.getStatus() >= 0) { - _DBG("response [%d] : %s", response.size(), response.toString().c_str()); + _DBG("response [%zu] : %s", response.size(), response.toString().c_str()); result = resp.getDataField(); @@ -251,7 +251,7 @@ namespace smartcard_service_api _ERR("status word [ %02X %02X ]", resp.getSW1(), resp.getSW2()); } } else { - _ERR("select apdu is failed, rv [%d], length [%d]", ret, response.size()); + _ERR("select apdu is failed, rv [%d], length [%zu]", ret, response.size()); } return ret; @@ -288,14 +288,14 @@ namespace smartcard_service_api ResponseHelper resp(response); if (resp.getStatus() >= 0) { - _DBG("response [%d] : %s", response.size(), response.toString().c_str()); + _DBG("response [%zu] : %s", response.size(), response.toString().c_str()); ret = SUCCESS; } else { _ERR("status word [ %02X %02X ]", resp.getSW1(), resp.getSW2()); } } else { - _ERR("select apdu is failed, rv [%d], length [%d]", ret, response.size()); + _ERR("select apdu is failed, rv [%d], length [%zu]", ret, response.size()); } return ret; diff --git a/common/GPARAACL.cpp b/common/GPARAACL.cpp index cfac446..f168981 100644 --- a/common/GPARAACL.cpp +++ b/common/GPARAACL.cpp @@ -161,7 +161,7 @@ namespace smartcard_service_api for (i = 0; i < length; i += 8) { temp.assign(tlv.getValue().getBuffer(i), 8); - _DBG("apdu rule[%d] : %s", temp.size(), temp.toString().c_str()); + _DBG("apdu rule[%zu] : %s", temp.size(), temp.toString().c_str()); apduRule.push_back(temp); } } else if (length == 1){ diff --git a/common/GPARAM.cpp b/common/GPARAM.cpp index a6013ec..585a3ae 100644 --- a/common/GPARAM.cpp +++ b/common/GPARAM.cpp @@ -79,7 +79,7 @@ namespace smartcard_service_api result = ResponseHelper::getStatus(resp); if (result >= SCARD_ERROR_OK) { response = ResponseHelper::getDataField(resp); - _DBG("response[%d] : %s", response.size(), response.toString().c_str()); + _DBG("response[%zu] : %s", response.size(), response.toString().c_str()); } else { _ERR("transmit returns error, [%d]", result); } @@ -116,7 +116,7 @@ namespace smartcard_service_api helper.getBuffer(cmd); - _DBG("command[%d] : %s", cmd.size(), cmd.toString().c_str()); + _DBG("command[%zu] : %s", cmd.size(), cmd.toString().c_str()); result = doTransmit(channel, cmd, response); @@ -206,7 +206,7 @@ namespace smartcard_service_api } } - _DBG("data[%d] : %s", data.size(), data.toString().c_str()); + _DBG("data[%zu] : %s", data.size(), data.toString().c_str()); } else if (length == 0) { _INFO("Response-ALL-AR-DO is empty"); data.clear(); @@ -267,7 +267,7 @@ namespace smartcard_service_api break; } } - _DBG("data[%d] : %s", data.size(), data.toString().c_str()); + _DBG("data[%zu] : %s", data.size(), data.toString().c_str()); } else { _INFO("Response-ALL-AR-DO is empty"); data.clear(); @@ -301,7 +301,7 @@ namespace smartcard_service_api tlv.size() == 8) { tag = tlv.getValue(); result = SCARD_ERROR_OK; - _DBG("refreshTag[%d] : %s", tag.size(), tag.toString().c_str()); + _DBG("refreshTag[%zu] : %s", tag.size(), tag.toString().c_str()); } else { _ERR("decodeTLV failed, %s", response.toString().c_str()); result = SCARD_ERROR_ILLEGAL_PARAM; diff --git a/common/PKCS15CDF.cpp b/common/PKCS15CDF.cpp index 7a44ed3..70fc067 100644 --- a/common/PKCS15CDF.cpp +++ b/common/PKCS15CDF.cpp @@ -208,7 +208,7 @@ namespace smartcard_service_api case (unsigned int)0x80 : /* length : INTEGER */ cert->length = NumberStream::getBigEndianNumber(tlv.getValue()); - _DBG("length : %d", cert->length); + _DBG("length : %zu", cert->length); break; } } @@ -220,7 +220,7 @@ namespace smartcard_service_api if (result >= SCARD_ERROR_OK) { result = file.readBinary(0, cert->length, cert->certificate); if (result >= SCARD_ERROR_OK) { - _DBG("certificate[%d] : %s", cert->certificate.size(), cert->certificate.toString().c_str()); + _DBG("certificate[%zu] : %s", cert->certificate.size(), cert->certificate.toString().c_str()); } else { _ERR("readBinary failed, [%x]", result); } @@ -237,7 +237,7 @@ namespace smartcard_service_api listCertType.push_back(cert); } - _INFO("listCertType.size() = %d", listCertType.size()); + _INFO("listCertType.size() = %zu", listCertType.size()); return (listCertType.size() > 0); } diff --git a/common/PKCS15DODF.cpp b/common/PKCS15DODF.cpp index ffc369a..d743b75 100644 --- a/common/PKCS15DODF.cpp +++ b/common/PKCS15DODF.cpp @@ -97,7 +97,7 @@ namespace smartcard_service_api } } - _INFO("dataList.size() = %d", mapOID.size()); + _INFO("dataList.size() = %zu", mapOID.size()); return result; } diff --git a/common/PKCS15ODF.cpp b/common/PKCS15ODF.cpp index 5794f2a..cb857b1 100644 --- a/common/PKCS15ODF.cpp +++ b/common/PKCS15ODF.cpp @@ -124,7 +124,7 @@ namespace smartcard_service_api } } - _INFO("dataList.size() = %d", dataList.size()); + _INFO("dataList.size() = %zu", dataList.size()); return result; } @@ -149,7 +149,7 @@ namespace smartcard_service_api dodf = NULL; } } else { - _ERR("[%02X] is not found. total [%d]", TAG_DODF, dataList.size()); + _ERR("[%02X] is not found. total [%zu]", TAG_DODF, dataList.size()); } } @@ -178,7 +178,7 @@ namespace smartcard_service_api cdf = NULL; } } else { - _ERR("[%02X] is not found. total [%d]", TAG_CDF, dataList.size()); + _ERR("[%02X] is not found. total [%zu]", TAG_CDF, dataList.size()); } } diff --git a/common/SignatureHelper.cpp b/common/SignatureHelper.cpp index b109936..df69c6a 100644 --- a/common/SignatureHelper.cpp +++ b/common/SignatureHelper.cpp @@ -82,7 +82,7 @@ namespace smartcard_service_api if (value != NULL && strlen(value) > 0) { OpensslHelper::decodeBase64String(value, result, false); if (result.size() > 0) { - _DBG("type [%d] hash [%d] : %s", type, result.size(), result.toString().c_str()); + _DBG("type [%d] hash [%zu] : %s", type, result.size(), result.toString().c_str()); break; } } @@ -166,7 +166,7 @@ namespace smartcard_service_api if (decodeValue.size() > 0) { OpensslHelper::digestBuffer("sha1", decodeValue.getBuffer(), decodeValue.size(), hash); if(hash.size() > 0) { - _DBG("type [%d] hash [%d] : %s", type, hash.size(), hash.toString().c_str()); + _DBG("type [%d] hash [%zu] : %s", type, hash.size(), hash.toString().c_str()); certHashes.push_back(hash); } } diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec index 8c43d39..61fe46d 100755 --- a/packaging/smartcard-service.spec +++ b/packaging/smartcard-service.spec @@ -8,7 +8,7 @@ ################################################################################ Name: smartcard-service Summary: Smartcard Service FW -Version: 0.1.55 +Version: 0.1.56 Release: 0 Group: Network & Connectivity Requires: %{name}-common = %{version}-%{release} diff --git a/server/ServerChannel.cpp b/server/ServerChannel.cpp index b89b94c..42b6929 100644 --- a/server/ServerChannel.cpp +++ b/server/ServerChannel.cpp @@ -53,7 +53,7 @@ namespace smartcard_service_api /* close channel */ command = apdu.generateAPDU(APDUHelper::COMMAND_CLOSE_LOGICAL_CHANNEL, channelNum, ByteArray::EMPTY); - _DBG("command [%d] : %s", command.size(), command.toString().c_str()); + _DBG("command [%zu] : %s", command.size(), command.toString().c_str()); rv = terminal->transmitSync(command, result); @@ -66,7 +66,7 @@ namespace smartcard_service_api _ERR("status word [ %02X %02X ]", resp.getSW1(), resp.getSW2()); } } else { - _ERR("select apdu is failed, rv [%d], length [%d]", rv, result.size()); + _ERR("select apdu is failed, rv [%d], length [%zu]", rv, result.size()); } channelNum = -1; @@ -102,7 +102,7 @@ namespace smartcard_service_api helper.setChannel(APDUCommand::CLA_CHANNEL_STANDARD, channelNum); helper.getBuffer(cmd); - _DBG("command [%d] : %s", cmd.size(), cmd.toString().c_str()); + _DBG("command [%zu] : %s", cmd.size(), cmd.toString().c_str()); ret = terminal->transmitSync(cmd, result); diff --git a/server/ServerGDBus.cpp b/server/ServerGDBus.cpp old mode 100755 new mode 100644 index 26698d6..7c7148d --- a/server/ServerGDBus.cpp +++ b/server/ServerGDBus.cpp @@ -68,7 +68,7 @@ namespace smartcard_service_api syncLock(); q.push(make_pair(cb, params)); - _INFO("request pushed, count [%d]", q.size()); + _INFO("request pushed, count [%zu]", q.size()); if (q.size() == 1) { /* start dispatch */ @@ -104,12 +104,12 @@ namespace smartcard_service_api dispatcher->syncLock(); dispatcher->q.pop(); - /* LCOV_EXCL_START */ + /* LCOV_EXCL_START */ if (dispatcher->q.size() > 0) { - _INFO("remaining messages : %d", dispatcher->q.size()); + _INFO("remaining messages : %zu", dispatcher->q.size()); result = true; - /* LCOV_EXCL_STOP */ + /* LCOV_EXCL_STOP */ } else { _INFO("dispatch finished"); } diff --git a/server/ServerResource.cpp b/server/ServerResource.cpp index 7f2db4e..1b06abe 100644 --- a/server/ServerResource.cpp +++ b/server/ServerResource.cpp @@ -505,7 +505,7 @@ namespace smartcard_service_api /* open channel */ command = APDUHelper::generateAPDU(APDUHelper::COMMAND_OPEN_LOGICAL_CHANNEL, 0, ByteArray::EMPTY); - _DBG("command [%d] : %s", command.size(), command.toString().c_str()); + _DBG("command [%zu] : %s", command.size(), command.toString().c_str()); rv = terminal->transmitSync(command, response); if (rv == 0 && response.size() >= 2) { @@ -517,7 +517,7 @@ namespace smartcard_service_api result = resp.getStatus(); } } else { - _ERR("transmitSync failed, rv [%d], length [%d]", rv, response.size()); + _ERR("transmitSync failed, rv [%d], length [%zu]", rv, response.size()); } return result; @@ -533,7 +533,7 @@ namespace smartcard_service_api /* open channel */ command = APDUHelper::generateAPDU(APDUHelper::COMMAND_CLOSE_LOGICAL_CHANNEL, channelNum, ByteArray::EMPTY); - _DBG("command [%d] : %s", command.size(), command.toString().c_str()); + _DBG("command [%zu] : %s", command.size(), command.toString().c_str()); rv = terminal->transmitSync(command, response); if (rv == 0 && response.size() >= 2) { @@ -546,7 +546,7 @@ namespace smartcard_service_api _ERR("status word [ %02X %02X ]", resp.getSW1(), resp.getSW2()); } } else { - _ERR("select apdu is failed, rv [%d], length [%d]", rv, response.size()); + _ERR("select apdu is failed, rv [%d], length [%zu]", rv, response.size()); } return result; diff --git a/server/ServerSession.cpp b/server/ServerSession.cpp old mode 100755 new mode 100644 diff --git a/server/ServiceInstance.cpp b/server/ServiceInstance.cpp old mode 100755 new mode 100644 diff --git a/server/private/AccessControl.cpp b/server/private/AccessControl.cpp old mode 100644 new mode 100755 diff --git a/server/private/PKCS15CDFACL.cpp b/server/private/PKCS15CDFACL.cpp old mode 100644 new mode 100755 index 31ce64c..7ecdd59 --- a/server/private/PKCS15CDFACL.cpp +++ b/server/private/PKCS15CDFACL.cpp @@ -107,7 +107,7 @@ namespace smartcard_service_api OpensslHelper::digestBuffer("SHA1", type->certificate, hash); - _INFO("cdf[%d] = %s", i, hash.toString().c_str()); + _INFO("cdf[%zu] = %s", i, hash.toString().c_str()); condition.addAccessRule(hash); } diff --git a/server/smartcard-daemon.cpp b/server/smartcard-daemon.cpp old mode 100755 new mode 100644 -- 2.7.4