pmt: reformat code

This commit is contained in:
2025-08-27 22:24:50 +03:00
parent 41336609fa
commit bfd3324558
8 changed files with 33 additions and 28 deletions

View File

@@ -28,8 +28,8 @@
namespace PartitionManager { namespace PartitionManager {
RUN_ASYNC(backupFunction)(const std::string &partitionName, RUN_ASYNC(backupFunction)(const std::string &partitionName,
const std::string &outputName, const std::string &outputName,
const uint64_t bufferSize) { const uint64_t bufferSize) {
if (!Variables->PartMap->hasPartition(partitionName)) if (!Variables->PartMap->hasPartition(partitionName))
return {format("Couldn't find partition: %s", partitionName.data()), false}; return {format("Couldn't find partition: %s", partitionName.data()), false};

View File

@@ -26,7 +26,7 @@ Copyright 2025 Yağız Zengin
namespace PartitionManager { namespace PartitionManager {
RUN_ASYNC(eraseFunction)(const std::string &partitionName, RUN_ASYNC(eraseFunction)(const std::string &partitionName,
const uint64_t bufferSize) { const uint64_t bufferSize) {
if (!Variables->PartMap->hasPartition(partitionName)) if (!Variables->PartMap->hasPartition(partitionName))
return {format("Couldn't find partition: %s", partitionName.data()), false}; return {format("Couldn't find partition: %s", partitionName.data()), false};

View File

@@ -26,8 +26,8 @@ Copyright 2025 Yağız Zengin
namespace PartitionManager { namespace PartitionManager {
RUN_ASYNC(flashFunction)(const std::string &partitionName, RUN_ASYNC(flashFunction)(const std::string &partitionName,
const std::string &imageName, const std::string &imageName,
const uint64_t bufferSize) { const uint64_t bufferSize) {
if (!Helper::fileIsExists(imageName)) if (!Helper::fileIsExists(imageName))
return {format("Couldn't find image file: %s", imageName.data()), false}; return {format("Couldn't find image file: %s", imageName.data()), false};
if (!Variables->PartMap->hasPartition(partitionName)) if (!Variables->PartMap->hasPartition(partitionName))

View File

@@ -32,9 +32,9 @@ INIT(partitionSizeFunction) {
<< "Initializing variables of partition size getter function." << "Initializing variables of partition size getter function."
<< std::endl; << std::endl;
cmd = _app.add_subcommand("sizeof", "Tell size(s) of input partition list") cmd = _app.add_subcommand("sizeof", "Tell size(s) of input partition list")
->footer("Use get-all or getvar-all as partition name for getting " ->footer("Use get-all or getvar-all as partition name for getting "
"sizes of all " "sizes of all "
"partitions."); "partitions.");
cmd->add_option("partition(s)", partitions, "Partition name(s).") cmd->add_option("partition(s)", partitions, "Partition name(s).")
->required() ->required()
->delimiter(','); ->delimiter(',');

View File

@@ -25,14 +25,15 @@
#define RUN(cls) bool cls::run() #define RUN(cls) bool cls::run()
#define RUN_ASYNC(cls) pair cls::runAsync #define RUN_ASYNC(cls) pair cls::runAsync
#define IS_USED(cls) bool cls::isUsed() const #define IS_USED(cls) bool cls::isUsed() const
#define IS_USED_COMMON_BODY(cls) bool cls::isUsed() const { return cmd->parsed(); } #define IS_USED_COMMON_BODY(cls) \
bool cls::isUsed() const { return cmd->parsed(); }
#define NAME(cls) const char *cls::name() const #define NAME(cls) const char *cls::name() const
#define COMMON_FUNCTION_BODY() \ #define COMMON_FUNCTION_BODY() \
CLI::App *cmd = nullptr; \ CLI::App *cmd = nullptr; \
bool init(CLI::App &_app) override; \ bool init(CLI::App &_app) override; \
bool run() override; \ bool run() override; \
[[nodiscard]] bool isUsed() const override; \ [[nodiscard]] bool isUsed() const override; \
[[nodiscard]] const char *name() const override [[nodiscard]] const char *name() const override
namespace PartitionManager { namespace PartitionManager {

View File

@@ -88,7 +88,7 @@ public:
void delAfterProgress(char *&_ptr); void delAfterProgress(char *&_ptr);
void delAfterProgress(uint8_t *&_ptr); void delAfterProgress(uint8_t *&_ptr);
void delFileAfterProgress(const std::string& path); void delFileAfterProgress(const std::string &path);
void closeAfterProgress(FILE *&_fp); void closeAfterProgress(FILE *&_fp);
void closeAfterProgress(int _fd); void closeAfterProgress(int _fd);
}; };
@@ -244,11 +244,12 @@ std::string getLibVersion();
if (condition) Helper::Logger(level, __func__, file, name, __FILE__, __LINE__) if (condition) Helper::Logger(level, __func__, file, name, __FILE__, __LINE__)
#ifdef ANDROID_BUILD #ifdef ANDROID_BUILD
#define MKVERSION(name) \ #define MKVERSION(name) \
char vinfo[512]; \ char vinfo[512]; \
sprintf(vinfo, \ sprintf(vinfo, \
"%s 1.2.0\nBuildType: Release\nCompiler: clang\n" \ "%s 1.2.0\nBuildType: Release\nCompiler: clang\n" \
"BuildFlags: -Wall;-Werror;-Wno-deprecated-declarations;-Os", name); \ "BuildFlags: -Wall;-Werror;-Wno-deprecated-declarations;-Os", \
name); \
return std::string(vinfo) return std::string(vinfo)
#else #else
#define MKVERSION(name) \ #define MKVERSION(name) \

View File

@@ -63,14 +63,14 @@ Logger::~Logger() {
#else #else
LoggingProperties::setLogFile("last_logs.log"); LoggingProperties::setLogFile("last_logs.log");
#endif #endif
LOGN(HELPER, INFO) << "Cannot create log file: " << _logFile << ": " LOGN(HELPER, INFO)
<< strerror(errno) << "Cannot create log file: " << _logFile << ": " << strerror(errno)
#ifdef ANDROID_BUILD #ifdef ANDROID_BUILD
<< " New logging file: /tmp/last_pmt_logs.log (this file)." << " New logging file: /tmp/last_pmt_logs.log (this file)."
#else #else
<< " New logging file: last_logs.log (this file)." << " New logging file: last_logs.log (this file)."
#endif #endif
<< std::endl; << std::endl;
} }
} }

View File

@@ -218,7 +218,8 @@ bool basic_partition_map_builder::readDefaultDirectories() {
return true; return true;
} }
bool basic_partition_map_builder::copyPartitionsToVector(std::vector<std::string> &vec) const { bool basic_partition_map_builder::copyPartitionsToVector(
std::vector<std::string> &vec) const {
if (_current_map.empty()) { if (_current_map.empty()) {
LOGN(MAP, ERROR) << "Current map is empty."; LOGN(MAP, ERROR) << "Current map is empty.";
return false; return false;
@@ -229,7 +230,8 @@ bool basic_partition_map_builder::copyPartitionsToVector(std::vector<std::string
return true; return true;
} }
bool basic_partition_map_builder::copyLogicalPartitionsToVector(std::vector<std::string> &vec) const { bool basic_partition_map_builder::copyLogicalPartitionsToVector(
std::vector<std::string> &vec) const {
if (_current_map.empty()) { if (_current_map.empty()) {
LOGN(MAP, ERROR) << "Current map is empty."; LOGN(MAP, ERROR) << "Current map is empty.";
return false; return false;
@@ -245,7 +247,8 @@ bool basic_partition_map_builder::copyLogicalPartitionsToVector(std::vector<std:
return true; return true;
} }
bool basic_partition_map_builder::copyPhysicalPartitionsToVector(std::vector<std::string> &vec) const { bool basic_partition_map_builder::copyPhysicalPartitionsToVector(
std::vector<std::string> &vec) const {
if (_current_map.empty()) { if (_current_map.empty()) {
LOGN(MAP, ERROR) << "Current map is empty."; LOGN(MAP, ERROR) << "Current map is empty.";
return false; return false;