diff --git a/interfaces/kits/js/src/file_manager_napi.cpp b/interfaces/kits/js/src/file_manager_napi.cpp index f919bfbdffa88b044934e637c2578b3f148bc430..73a1a9e47d238cc38be4c25e4bbfc7ec7e3bb799 100644 --- a/interfaces/kits/js/src/file_manager_napi.cpp +++ b/interfaces/kits/js/src/file_manager_napi.cpp @@ -166,7 +166,7 @@ napi_value FileManagerNapi::CreateFile(napi_env env, napi_callback_info info) } }; string procedureName = "CreateFile"; - int argc = funcArg.GetArgc(); + size_t argc = funcArg.GetArgc(); NVal thisVar(env, funcArg.GetThisVar()); if (argc == CREATE_FILE_PARA_MIN || (argc != CREATE_FILE_PARA_MAX && option.GetHasOpt())) { return NAsyncWorkPromise(env, thisVar).Schedule(procedureName, cbExec, cbComplete).val_; @@ -180,7 +180,7 @@ napi_value FileManagerNapi::CreateFile(napi_env env, napi_callback_info info) static bool CreateFileArray(napi_env env, shared_ptr arg) { - for (unsigned int i = 0; i < arg->fileRes_.size(); i++) { + for (size_t i = 0; i < arg->fileRes_.size(); i++) { NVal obj = NVal::CreateObject(env); shared_ptr res = arg->fileRes_[i]; if (res == nullptr) { @@ -261,7 +261,7 @@ napi_value FileManagerNapi::GetRoot(napi_env env, napi_callback_info info) } }; string procedureName = "GetRoot"; - int argc = funcArg.GetArgc(); + size_t argc = funcArg.GetArgc(); NVal thisVar(env, funcArg.GetThisVar()); if (argc == GET_ROOT_PARA_MIN || (argc != GET_ROOT_PARA_MAX && option.GetHasOpt())) { return NAsyncWorkPromise(env, thisVar).Schedule(procedureName, cbExec, cbComplete).val_; @@ -353,8 +353,7 @@ napi_value FileManagerNapi::ListFile(napi_env env, napi_callback_info info) napi_value fileArr; napi_create_array(env, &fileArr); auto arg = make_shared(NVal(env, fileArr)); - auto cbExec = [type = string(type.get()), path = string(path.get()), option, arg] - (napi_env env) -> UniError { + auto cbExec = [type = string(type.get()), path = string(path.get()), option, arg](napi_env env) -> UniError { IFmsClient* client = nullptr; bool succ = false; tie(succ, client) = GetFmsClient(); @@ -376,7 +375,7 @@ napi_value FileManagerNapi::ListFile(napi_env env, napi_callback_info info) } }; string procedureName = "ListFile"; - int argc = funcArg.GetArgc(); + size_t argc = funcArg.GetArgc(); NVal thisVar(env, funcArg.GetThisVar()); if (argc == LIST_FILE_PARA_MIN || (argc != LIST_FILE_PARA_MAX && option.GetHasOpt())) { return NAsyncWorkPromise(env, thisVar).Schedule(procedureName, cbExec, cbComplete).val_; diff --git a/services/src/fileoper/cmd_response.h b/services/src/fileoper/cmd_response.h index ba561b016364319879eae4d14e9e662af00bd414..f4a3b445b6d7634f95ea52e490f6f1f1e667f14b 100644 --- a/services/src/fileoper/cmd_response.h +++ b/services/src/fileoper/cmd_response.h @@ -66,11 +66,11 @@ public: { parcel.WriteInt32(err_); parcel.WriteString(uri_); - int fileCount = vecFileInfo_.size(); - parcel.WriteInt32(fileCount); - for (int i = 0; i < fileCount; i++) { + size_t fileCount = vecFileInfo_.size(); + parcel.WriteUint64(fileCount); + for (size_t i = 0; i < fileCount; i++) { if (parcel.WriteParcelable(vecFileInfo_[i].get()) != true) { - ERR_LOG("Marshalling fail total:%{public}d i:%{public}d", fileCount, i); + ERR_LOG("Marshalling FileInfo fails!"); return false; } } @@ -85,8 +85,8 @@ public: } obj->err_ = parcel.ReadInt32(); obj->uri_ = parcel.ReadString(); - int fileCount = parcel.ReadInt32(); - for (int i = 0; i < fileCount; i++) { + size_t fileCount = parcel.ReadUint64(); + for (size_t i = 0; i < fileCount; i++) { std::shared_ptr file(parcel.ReadParcelable()); obj->vecFileInfo_.emplace_back(file); } diff --git a/services/src/fileoper/external_storage_utils.cpp b/services/src/fileoper/external_storage_utils.cpp index 9e267f2df646a2d291acbe64838711db5945af58..20ca2545ee9afa5640993e8d9d6c30e2c91dbcea 100644 --- a/services/src/fileoper/external_storage_utils.cpp +++ b/services/src/fileoper/external_storage_utils.cpp @@ -52,7 +52,7 @@ static bool GetRealPath(string &path) { char filePath[PATH_MAX + 1] = { 0 }; if (realpath(path.c_str(), filePath) == nullptr) { - ERR_LOG("untrustPath invalid %{public}d %{public}s \n", errno, strerror(errno)); + ERR_LOG("untrustPath invalid %{public}d\n", errno); return false; } path = string(filePath); @@ -168,7 +168,7 @@ int ExternalStorageUtils::DoCreateFile(const std::string &uri, const std::string return E_NOEXIST; } size_t len = path.size(); - if (path.at(len -1) != '/') { + if (path.at(len - 1) != '/') { path.append("/").append(name); } else { path.append(name);