From 397b95466d29af77e48aaeddbb09a7934fb2947b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ya=C4=9F=C4=B1z=20Zengin?= Date: Wed, 24 Sep 2025 22:14:25 +0300 Subject: [PATCH] pmt: reformat code, etc. --- include/PartitionManager/PartitionManager.hpp | 6 ++-- srclib/libhelper/include/libhelper/lib.hpp | 31 ++++++++++--------- srclib/libhelper/src/Classes.cpp | 8 ++--- srclib/libhelper/tests/test.cpp | 2 +- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/include/PartitionManager/PartitionManager.hpp b/include/PartitionManager/PartitionManager.hpp index 954d2e7..96571b1 100644 --- a/include/PartitionManager/PartitionManager.hpp +++ b/include/PartitionManager/PartitionManager.hpp @@ -82,8 +82,7 @@ public: }; // A class for function management. -template -class basic_manager { +template class basic_manager { private: std::vector> _functions; @@ -127,8 +126,7 @@ public: } [[nodiscard]] bool handleAll() const { - LOGN(PMTF, INFO) << "running caught commands in command-line." - << std::endl; + LOGN(PMTF, INFO) << "running caught commands in command-line." << std::endl; for (const auto &func : _functions) { if (func->isUsed()) { LOGN(PMTF, INFO) << func->name() diff --git a/srclib/libhelper/include/libhelper/lib.hpp b/srclib/libhelper/include/libhelper/lib.hpp index 1026daa..4f54836 100644 --- a/srclib/libhelper/include/libhelper/lib.hpp +++ b/srclib/libhelper/include/libhelper/lib.hpp @@ -60,17 +60,29 @@ constexpr int YES = 1; constexpr int NO = 0; namespace Helper { +// Throwable error class +class Error final : public std::exception { +private: + std::string _message; + std::ostringstream _oss; + +public: + __attribute__((format(printf, 2, 3))) explicit Error(const char *format, ...); + + [[nodiscard]] const char *what() const noexcept override; +}; + // Logging class Logger final { private: LogLevels _level; std::ostringstream _oss; - const char *_funcname, *_logFile, *_program_name, *_file; + const char *_function_name, *_logFile, *_program_name, *_file; int _line; public: Logger(LogLevels level, const char *func, const char *file, const char *name, - const char *sfile, int line); + const char *source_file, int line); ~Logger(); @@ -82,17 +94,6 @@ public: Logger &operator<<(std::ostream &(*msg)(std::ostream &)); }; -// Throwable error class -class Error final : public std::exception { -private: - std::string _message; - -public: - __attribute__((format(printf, 2, 3))) explicit Error(const char *format, ...); - - [[nodiscard]] const char *what() const noexcept override; -}; - // Close file descriptors and delete allocated array memory class garbageCollector { private: @@ -214,7 +215,7 @@ public: }; Data *tuple_data = nullptr; - Data tuple_data_type = { _Type1{}, _Type2{}, _Type3{}}; + Data tuple_data_type = {_Type1{}, _Type2{}, _Type3{}}; size_t capacity{}, count{}; PureTuple() : tuple_data(new Data[20]), capacity(20), count(0) {} @@ -857,7 +858,7 @@ std::string getLibVersion(); #define MKVERSION(name) \ char vinfo[512]; \ sprintf(vinfo, \ - "%s 1.3.0\nCompiler: clang\n" \ + "%s 1.3.0\nCompiler: clang\n" \ "BuildFlags: -Wall;-Werror;-Wno-deprecated-declarations;-Os", \ name); \ return std::string(vinfo) diff --git a/srclib/libhelper/src/Classes.cpp b/srclib/libhelper/src/Classes.cpp index 02f9aee..4bca943 100644 --- a/srclib/libhelper/src/Classes.cpp +++ b/srclib/libhelper/src/Classes.cpp @@ -42,9 +42,9 @@ Error::Error(const char *format, ...) { const char *Error::what() const noexcept { return _message.data(); } Logger::Logger(const LogLevels level, const char *func, const char *file, - const char *name, const char *sfile, const int line) - : _level(level), _funcname(func), _logFile(file), _program_name(name), - _file(sfile), _line(line) {} + const char *name, const char *source_file, const int line) + : _level(level), _function_name(func), _logFile(file), _program_name(name), + _file(source_file), _line(line) {} Logger::~Logger() { if (LoggingProperties::DISABLE) return; @@ -52,7 +52,7 @@ Logger::~Logger() { snprintf(str, sizeof(str), "<%c> [ %s %s] %s(): %s", static_cast(_level), _program_name, basename(const_cast(_file)), _line, currentDate().data(), - currentTime().data(), _funcname, _oss.str().data()); + currentTime().data(), _function_name, _oss.str().data()); if (!isExists(_logFile)) { if (const int fd = diff --git a/srclib/libhelper/tests/test.cpp b/srclib/libhelper/tests/test.cpp index 9621c3d..8c58d91 100644 --- a/srclib/libhelper/tests/test.cpp +++ b/srclib/libhelper/tests/test.cpp @@ -120,7 +120,7 @@ int main(int argc, char **argv) { << std::endl; Helper::PureTuple values = { - {1, "hi", true}, {2, "im", true}, {3, "helper", false}}; + {1, "hi", true}, {2, "im", true}, {3, "helper", false}}; values.insert(std::make_tuple(0, "hi", false)); values.insert(2, "im", true);