From 295e890324c0a2826d5a43fe3617585841a9daec Mon Sep 17 00:00:00 2001 From: YZBruh Date: Mon, 11 Aug 2025 09:48:00 +0300 Subject: [PATCH] libhelper: improve garbageCollector --- include/PartitionManager/PartitionManager.hpp | 6 +----- srclib/libhelper/include/libhelper/lib.hpp | 3 ++- srclib/libhelper/src/Classes.cpp | 2 +- srclib/libhelper/src/Utilities.cpp | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/PartitionManager/PartitionManager.hpp b/include/PartitionManager/PartitionManager.hpp index 761bc1f..d091b50 100644 --- a/include/PartitionManager/PartitionManager.hpp +++ b/include/PartitionManager/PartitionManager.hpp @@ -19,15 +19,11 @@ #include #include +#include #include #include #include -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include -#pragma GCC diagnostic pop - #define PMT "libpmt" #define PMTE "pmt" #define PMTF "libpmt-function-manager" diff --git a/srclib/libhelper/include/libhelper/lib.hpp b/srclib/libhelper/include/libhelper/lib.hpp index ccb0008..2c43444 100644 --- a/srclib/libhelper/include/libhelper/lib.hpp +++ b/srclib/libhelper/include/libhelper/lib.hpp @@ -23,6 +23,7 @@ #include #include #include +#include #ifndef ONLY_HELPER_MACROS @@ -86,7 +87,7 @@ public: void delAfterProgress(char *&_ptr); void delAfterProgress(uint8_t *&_ptr); - void delAfterProgress(FILE *&_fp); + void closeAfterProgress(FILE *&_fp); void closeAfterProgress(int _fd); }; diff --git a/srclib/libhelper/src/Classes.cpp b/srclib/libhelper/src/Classes.cpp index 35f5194..6aeb702 100644 --- a/srclib/libhelper/src/Classes.cpp +++ b/srclib/libhelper/src/Classes.cpp @@ -106,5 +106,5 @@ void garbageCollector::delAfterProgress(uint8_t *&_ptr) { void garbageCollector::closeAfterProgress(const int _fd) { _fds.push_back(_fd); } -void garbageCollector::delAfterProgress(FILE *&_fp) { _fps.push_back(_fp); } +void garbageCollector::closeAfterProgress(FILE *&_fp) { _fps.push_back(_fp); } } // namespace Helper diff --git a/srclib/libhelper/src/Utilities.cpp b/srclib/libhelper/src/Utilities.cpp index a259043..554d772 100644 --- a/srclib/libhelper/src/Utilities.cpp +++ b/srclib/libhelper/src/Utilities.cpp @@ -194,7 +194,7 @@ int openAndAddToCloseList(const std::string_view &path, FILE *openAndAddToCloseList(const std::string_view &path, garbageCollector &collector, const char *mode) { FILE *fp = fopen(path.data(), mode); - collector.delAfterProgress(fp); + collector.closeAfterProgress(fp); return fp; }