luo980/uvw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs: avoid unnecessary array

Browse Source
This commit is contained in:
Michele Caini 2024-10-23 18:01:29 +02:00
parent 58b8b3d610
commit a3f2a6e3ac
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/uvw/fs.h
View File

@ -1196,7 +1196,7 @@ public:
std::pair<bool, std::pair<entry_type, const char *>> readdir_sync(); std::pair<bool, std::pair<entry_type, const char *>> readdir_sync();
private: private:
uv_dirent_t dirents[1]; uv_dirent_t dirents;
}; };
/*! @brief Helper functions. */ /*! @brief Helper functions. */

12
src/uvw/fs.ipp
View File

@ -313,11 +313,11 @@ UVW_INLINE std::pair<bool, std::pair<fs_req::entry_type, const char *>> fs_req::
std::pair<bool, std::pair<entry_type, const char *>> ret{false, {entry_type::UNKNOWN, nullptr}}; std::pair<bool, std::pair<entry_type, const char *>> ret{false, {entry_type::UNKNOWN, nullptr}};
uv_fs_req_cleanup(raw()); uv_fs_req_cleanup(raw());
auto res = uv_fs_scandir_next(raw(), dirents); auto res = uv_fs_scandir_next(raw(), &dirents);
if(UV_EOF != res) { if(UV_EOF != res) {
ret.second.first = static_cast<entry_type>(dirents[0].type); ret.second.first = static_cast<entry_type>(dirents.type);
ret.second.second = dirents[0].name; ret.second.second = dirents.name;
ret.first = true; ret.first = true;
} }
@ -523,7 +523,7 @@ UVW_INLINE bool fs_req::closedir_sync() {
UVW_INLINE void fs_req::readdir() { UVW_INLINE void fs_req::readdir() {
auto req = raw(); auto req = raw();
auto *dir = static_cast<uv_dir_t *>(req->ptr); auto *dir = static_cast<uv_dir_t *>(req->ptr);
dir->dirents = dirents; dir->dirents = &dirents;
dir->nentries = 1; dir->nentries = 1;
uv_fs_req_cleanup(this->raw()); uv_fs_req_cleanup(this->raw());
uv_fs_readdir(parent().raw(), req, dir, &fs_request_callback); uv_fs_readdir(parent().raw(), req, dir, &fs_request_callback);
@ -532,11 +532,11 @@ UVW_INLINE void fs_req::readdir() {
UVW_INLINE std::pair<bool, std::pair<fs_req::entry_type, const char *>> fs_req::readdir_sync() { UVW_INLINE std::pair<bool, std::pair<fs_req::entry_type, const char *>> fs_req::readdir_sync() {
auto req = raw(); auto req = raw();
auto *dir = static_cast<uv_dir_t *>(req->ptr); auto *dir = static_cast<uv_dir_t *>(req->ptr);
dir->dirents = dirents; dir->dirents = &dirents;
dir->nentries = 1; dir->nentries = 1;
uv_fs_req_cleanup(this->raw()); uv_fs_req_cleanup(this->raw());
uv_fs_readdir(parent().raw(), req, dir, nullptr); uv_fs_readdir(parent().raw(), req, dir, nullptr);
return {req->result != 0, {static_cast<entry_type>(dirents[0].type), dirents[0].name}}; return {req->result != 0, {static_cast<entry_type>(dirents.type), dirents.name}};
} }
UVW_INLINE os_file_descriptor fs_helper::handle(file_handle file) noexcept { UVW_INLINE os_file_descriptor fs_helper::handle(file_handle file) noexcept {