diff --git a/frameworks/innerkits/file_access/include/ifile_ext_base.h b/frameworks/innerkits/file_access/include/ifile_ext_base.h index 24f43f63aa36080931c56e09ec0754efc21d1b83..5964a4fbe77b15f5710f6273a8bcb4482818a628 100644 --- a/frameworks/innerkits/file_access/include/ifile_ext_base.h +++ b/frameworks/innerkits/file_access/include/ifile_ext_base.h @@ -17,6 +17,7 @@ #define I_FILE_EXT_BASE_H #include +#include #include #include diff --git a/frameworks/innerkits/file_access/src/file_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_ext_proxy.cpp index 84406b37a8da912c97db04380909c3df26c2c086..a4f3eff5c9306e3c238d951f8a511ff97f44fa9e 100644 --- a/frameworks/innerkits/file_access/src/file_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_ext_proxy.cpp @@ -275,7 +275,7 @@ std::vector FileExtProxy::ListFile(const Uri &sourceFileUri) } } - HILOG_INFO("%{public}s end successfully, return vec.size=%{public}d", __func__, vec.size()); + HILOG_INFO("%{public}s end successfully, return vec.size=%{public}zu", __func__, vec.size()); return vec; } @@ -306,7 +306,7 @@ std::vector FileExtProxy::GetRoots() } } - HILOG_INFO("%{public}s end successfully, return vec.size=%{public}d", __func__, vec.size()); + HILOG_INFO("%{public}s end successfully, return vec.size=%{public}zu", __func__, vec.size()); return vec; } } // namespace FileAccessFwk diff --git a/frameworks/innerkits/file_access/src/file_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_ext_stub.cpp index 2d6c198ecc3821cdd63a6604da118f2a0be6019a..45ce9b783f53dbf83068236814d9084f985d0cb4 100644 --- a/frameworks/innerkits/file_access/src/file_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_ext_stub.cpp @@ -244,7 +244,7 @@ ErrCode FileExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply) } for (uint64_t i = 0; i < count; i++) { if (!reply.WriteParcelable(&vec[i])) { - HILOG_ERROR("%{public}s fail to WriteParcelable vec, index = %{public}llu", __func__, i); + HILOG_ERROR("%{public}s fail to WriteParcelable vec", __func__); return ERR_INVALID_VALUE; } } @@ -265,7 +265,7 @@ ErrCode FileExtStub::CmdGetRoots(MessageParcel &data, MessageParcel &reply) } for (uint64_t i = 0; i < count; i++) { if (!reply.WriteParcelable(&vec[i])) { - HILOG_ERROR("%{public}s fail to WriteParcelable ret, index = %{public}llu", __func__, i); + HILOG_ERROR("%{public}s fail to WriteParcelable ret", __func__); return ERR_INVALID_VALUE; } } diff --git a/frameworks/innerkits/file_access/src/js_file_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_ext_ability.cpp index e09689384b0ccbda846031d5c8612768ca717aa2..1e6f0334cbd6a9e2b84e727abbc18ba3b330e5f2 100644 --- a/frameworks/innerkits/file_access/src/js_file_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_ext_ability.cpp @@ -326,7 +326,7 @@ std::vector JsFileExtAbility::ListFile(const Uri &sourceFileUri) return vec; } if (UnwrapArrayFileInfoFromJS(env, reinterpret_cast(nativeResult), vec)) { - HILOG_INFO("%{public}s end vec.size:%{public}d.", __func__, vec.size()); + HILOG_INFO("%{public}s end vec.size:%{public}zu.", __func__, vec.size()); return vec; } else { HILOG_ERROR("%{public}s end with faild.", __func__); @@ -348,7 +348,7 @@ std::vector JsFileExtAbility::GetRoots() return vec; } if (UnwrapArrayDeviceInfoFromJS(env, reinterpret_cast(nativeResult), vec)) { - HILOG_INFO("%{public}s end vec.size:%{public}d.", __func__, vec.size()); + HILOG_INFO("%{public}s end vec.size:%{public}zu.", __func__, vec.size()); return vec; } else { HILOG_ERROR("%{public}s end with faild.", __func__); diff --git a/frameworks/innerkits/file_access/src/napi_common_fileaccess.cpp b/frameworks/innerkits/file_access/src/napi_common_fileaccess.cpp index 3714a061a8133b00011eb4055a7fac856eebc7be..cdd1dffb6699ff5c0f12ed4055ea8661610bc5c9 100644 --- a/frameworks/innerkits/file_access/src/napi_common_fileaccess.cpp +++ b/frameworks/innerkits/file_access/src/napi_common_fileaccess.cpp @@ -83,7 +83,7 @@ uint64_t UnwrapBigIntUint64FromJS(napi_env env, napi_value param, uint64_t defau bool lossless = true; uint64_t value = defaultValue; if (napi_get_value_bigint_uint64(env, param, &value, &lossless) == napi_ok) { - HILOG_INFO("%{public}s,called value: %{public}llu.", __func__, defaultValue); + HILOG_INFO("%{public}s,called value: %{public}" PRIu64 ".", __func__, defaultValue); return value; } else { HILOG_INFO("%{public}s,called end with faild.", __func__); @@ -96,7 +96,7 @@ bool UnwrapBigIntUint64FromJS2(napi_env env, napi_value param, uint64_t &default HILOG_INFO("%{public}s,called begin", __func__); bool lossless = true; if (napi_get_value_bigint_uint64(env, param, &defaultValue, &lossless) == napi_ok) { - HILOG_INFO("%{public}s,called value: %{public}llu.", __func__, defaultValue); + HILOG_INFO("%{public}s,called value: %{public}" PRIu64 ".", __func__, defaultValue); return true; } else { HILOG_INFO("%{public}s,called end with faild.", __func__); @@ -123,8 +123,8 @@ napi_value WrapFileInfo(napi_env env, const FileInfo &fileInfo) HILOG_INFO("%{public}s,uri: %{public}s", __func__, fileInfo.uri.ToString().c_str()); HILOG_INFO("%{public}s,fileName: %{public}s", __func__, fileInfo.fileName.c_str()); HILOG_INFO("%{public}s,mode: %{public}s", __func__, fileInfo.mode.c_str()); - HILOG_INFO("%{public}s,size: %{public}lld", __func__, fileInfo.size); - HILOG_INFO("%{public}s,mtime: %{public}lld", __func__, fileInfo.mtime); + HILOG_INFO("%{public}s,size: %{public}" PRId64 "", __func__, fileInfo.size); + HILOG_INFO("%{public}s,mtime: %{public}" PRId64 "", __func__, fileInfo.mtime); HILOG_INFO("%{public}s,mimiType: %{public}s", __func__, fileInfo.mimiType.c_str()); napi_value jsObject = nullptr; napi_value jsValue = nullptr; @@ -200,8 +200,8 @@ bool UnwrapFileInfo(napi_env env, napi_value param, FileInfo &fileInfo) HILOG_INFO("%{public}s,uri: %{public}s", __func__, fileInfo.uri.ToString().c_str()); HILOG_INFO("%{public}s,fileName: %{public}s", __func__, fileInfo.fileName.c_str()); HILOG_INFO("%{public}s,mode: %{public}s", __func__, fileInfo.mode.c_str()); - HILOG_INFO("%{public}s,size: %{public}lld", __func__, fileInfo.size); - HILOG_INFO("%{public}s,mtime: %{public}lld", __func__, fileInfo.mtime); + HILOG_INFO("%{public}s,size: %{public}" PRId64 "", __func__, fileInfo.size); + HILOG_INFO("%{public}s,mtime: %{public}" PRId64 "", __func__, fileInfo.mtime); HILOG_INFO("%{public}s,mimiType: %{public}s", __func__, fileInfo.mimiType.c_str()); HILOG_INFO("%{public}s,end", __func__); return true; @@ -306,7 +306,7 @@ bool UnwrapDeviceInfo(napi_env env, napi_value param, DeviceInfo &deviceInfo) uint32_t natValueUint32 = 0; if (UnwrapUint32ByPropertyName(env, param, "flags", natValueUint32)) { - HILOG_INFO("%{public}s,flags: %{public}zu", __func__, natValueUint32); + HILOG_INFO("%{public}s,flags: %{public}u", __func__, natValueUint32); deviceInfo.flags = natValueUint32; } HILOG_INFO("%{public}s,uri: %{public}s", __func__, deviceInfo.uri.ToString().c_str());