diff --git a/interfaces/kits/js/src/mod_fileio/class_randomaccessfile/randomaccessfile_n_exporter.cpp b/interfaces/kits/js/src/mod_fileio/class_randomaccessfile/randomaccessfile_n_exporter.cpp index 74098271a104a5a8259f56d71d4edf67d59cf05d..97f1167371189532d5c06e32b79dc68d4eb01adf 100644 --- a/interfaces/kits/js/src/mod_fileio/class_randomaccessfile/randomaccessfile_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fileio/class_randomaccessfile/randomaccessfile_n_exporter.cpp @@ -174,7 +174,7 @@ napi_value RandomAccessFileNExporter::ReadSync(napi_env env, napi_callback_info UniError(EINVAL).ThrowErr(env, "Invalid buffer/options"); return nullptr; } - ssize_t actLen = DoReadRAF(env, buf, len, rafEntity->fd_.get()->GetFD(), rafEntity->fpointer + pos); + size_t actLen = DoReadRAF(env, buf, len, rafEntity->fd_.get()->GetFD(), rafEntity->fpointer + pos); if (actLen < 0) { UniError(errno).ThrowErr(env); return nullptr; @@ -184,7 +184,7 @@ napi_value RandomAccessFileNExporter::ReadSync(napi_env env, napi_callback_info } struct AsyncIOReadArg { - ssize_t lenRead { 0 }; + size_t lenRead { 0 }; int offset { 0 }; NRef refReadBuf; @@ -212,7 +212,7 @@ static napi_value ReadExec(napi_env env, NFuncArg &funcArg) auto arg = make_shared(NVal(env, funcArg[NARG_POS::FIRST])); auto cbExec = [arg, buf, len, hasPos, pos, offset, rafEntity](napi_env env) -> UniError { - ssize_t actLen = DoReadRAF(env, buf, len, rafEntity->fd_.get()->GetFD(), rafEntity->fpointer + pos); + size_t actLen = DoReadRAF(env, buf, len, rafEntity->fd_.get()->GetFD(), rafEntity->fpointer + pos); if (actLen < 0) { return UniError(errno); } diff --git a/interfaces/kits/js/src/mod_fs/common_func.cpp b/interfaces/kits/js/src/mod_fs/common_func.cpp index 575f6ecc55c543f592e61d7b605da80950aba2ad..eb115c60c3c8050f788e07314b6176192335579a 100644 --- a/interfaces/kits/js/src/mod_fs/common_func.cpp +++ b/interfaces/kits/js/src/mod_fs/common_func.cpp @@ -96,21 +96,21 @@ static tuple GetActualLen(napi_env env, int64_t bufLen, int64_t bu return { true, retLen }; } -int CommonFunc::ConvertJsFlags(int &flags) +unsigned int CommonFunc::ConvertJsFlags(unsigned int &flags) { - static constexpr int USR_O_RDONLY = 00; - static constexpr int USR_O_WRONLY = 01; - static constexpr int USR_O_RDWR = 02; - static constexpr int USR_O_CREAT = 0100; - static constexpr int USR_O_EXCL = 0200; - static constexpr int USR_O_TRUNC = 01000; - static constexpr int USR_O_APPEND = 02000; - static constexpr int USR_O_NONBLOCK = 04000; - static constexpr int USR_O_DIRECTORY = 0200000; - static constexpr int USR_O_NOFOLLOW = 0400000; - static constexpr int USR_O_SYNC = 04010000; + static constexpr unsigned int USR_O_RDONLY = 00; + static constexpr unsigned int USR_O_WRONLY = 01; + static constexpr unsigned int USR_O_RDWR = 02; + static constexpr unsigned int USR_O_CREAT = 0100; + static constexpr unsigned int USR_O_EXCL = 0200; + static constexpr unsigned int USR_O_TRUNC = 01000; + static constexpr unsigned int USR_O_APPEND = 02000; + static constexpr unsigned int USR_O_NONBLOCK = 04000; + static constexpr unsigned int USR_O_DIRECTORY = 0200000; + static constexpr unsigned int USR_O_NOFOLLOW = 0400000; + static constexpr unsigned int USR_O_SYNC = 04010000; - int flagsABI = 0; + unsigned int flagsABI = 0; flagsABI |= ((flags & USR_O_RDONLY) == USR_O_RDONLY) ? O_RDONLY : 0; flagsABI |= ((flags & USR_O_WRONLY) == USR_O_WRONLY) ? O_WRONLY : 0; flagsABI |= ((flags & USR_O_RDWR) == USR_O_RDWR) ? O_RDWR : 0; @@ -175,7 +175,7 @@ void CommonFunc::fs_req_cleanup(uv_fs_t* req) } } -string CommonFunc::GetModeFromFlags(int flags) +string CommonFunc::GetModeFromFlags(unsigned int flags) { const string RDONLY = "r"; const string WRONLY = "w"; diff --git a/interfaces/kits/js/src/mod_fs/common_func.h b/interfaces/kits/js/src/mod_fs/common_func.h index 1fe648de49265e3d616b4932da95254eb6a149d8..aba4d6e9c7767e302291b1e81b9649264ff2366a 100644 --- a/interfaces/kits/js/src/mod_fs/common_func.h +++ b/interfaces/kits/js/src/mod_fs/common_func.h @@ -45,7 +45,7 @@ struct FileInfo { void InitOpenMode(napi_env env, napi_value exports); struct CommonFunc { - static int ConvertJsFlags(int &flags); + static unsigned int ConvertJsFlags(unsigned int &flags); static LibN::NVal InstantiateStat(napi_env env, struct stat &buf); static LibN::NVal InstantiateStream(napi_env env, std::unique_ptr fp); static std::tuple GetReadArg(napi_env env, @@ -58,7 +58,7 @@ struct CommonFunc { napi_value srcPath, napi_value dstPath); static void fs_req_cleanup(uv_fs_t* req); - static std::string GetModeFromFlags(int flags); + static std::string GetModeFromFlags(unsigned int flags); }; } // namespace ModuleFileIO } // namespace FileManagement diff --git a/interfaces/kits/js/src/mod_fs/properties/open.cpp b/interfaces/kits/js/src/mod_fs/properties/open.cpp index bb9aa36fb8e34877828e2074413485cc38a6b04b..4d337d9a37cd46f9f1fa8f68855232c449b51597 100644 --- a/interfaces/kits/js/src/mod_fs/properties/open.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/open.cpp @@ -33,13 +33,13 @@ namespace ModuleFileIO { using namespace std; using namespace OHOS::FileManagement::LibN; -static tuple GetJsFlags(napi_env env, const NFuncArg &funcArg) +static tuple GetJsFlags(napi_env env, const NFuncArg &funcArg) { - int mode = O_RDONLY; + unsigned int mode = O_RDONLY; bool succ = false; if (funcArg.GetArgc() >= NARG_CNT::TWO && NVal(env, funcArg[NARG_POS::SECOND]).TypeIs(napi_number)) { tie(succ, mode) = NVal(env, funcArg[NARG_POS::SECOND]).ToInt32(); - int invalidMode = (O_WRONLY | O_RDWR); + unsigned int invalidMode = (O_WRONLY | O_RDWR); if (!succ || ((mode & invalidMode) == invalidMode)) { HILOGE("Invalid mode"); NError(EINVAL).ThrowErr(env); @@ -77,7 +77,7 @@ static NVal InstantiateFile(napi_env env, int fd, string pathOrUri, bool isUri) return { env, objFile }; } -static int OpenFileByDatashare(napi_env env, napi_value argv, string path, int flags) +static int OpenFileByDatashare(napi_env env, napi_value argv, string path, unsigned int flags) { std::shared_ptr dataShareHelper = nullptr; int fd = -1;