From b5f345e22accbf6cdea4e1701027af7bfe434603 Mon Sep 17 00:00:00 2001 From: Maschell Date: Sun, 7 Jun 2020 14:18:34 +0200 Subject: [PATCH] Formatting --- source/module/ModuleDataFactory.cpp | 19 ++++++++++--------- source/module/ModuleDataFactory.h | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/source/module/ModuleDataFactory.cpp b/source/module/ModuleDataFactory.cpp index a07ff5e..73e19f6 100644 --- a/source/module/ModuleDataFactory.cpp +++ b/source/module/ModuleDataFactory.cpp @@ -30,7 +30,7 @@ using namespace ELFIO; -std::optional ModuleDataFactory::load(std::string path, uint32_t* destination_address_ptr, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length) { +std::optional ModuleDataFactory::load(std::string path, uint32_t *destination_address_ptr, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length) { elfio reader; ModuleData moduleData; @@ -141,8 +141,8 @@ std::optional ModuleDataFactory::load(std::string path, uint32_t* de wums_entry_t *entries = (wums_entry_t *) secInfo->getAddress(); if (entries != NULL) { for (size_t j = 0; j < entries_count; j++) { - wums_entry_t * exp = &entries[j]; - DEBUG_FUNCTION_LINE("Saving export of type %08X, name %s, target: %08X"/*,pluginData.getPluginInformation()->getName().c_str()*/, exp->type, exp->name, (void *) exp->address); + wums_entry_t *exp = &entries[j]; + DEBUG_FUNCTION_LINE("Saving export of type %08X, name %s, target: %08X"/*,pluginData.getPluginInformation()->getName().c_str()*/, exp->type, exp->name, (void *) exp->address); ExportData export_data(exp->type, exp->name, exp->address); moduleData.addExportData(export_data); } @@ -155,7 +155,7 @@ std::optional ModuleDataFactory::load(std::string path, uint32_t* de wums_hook_t *hooks = (wums_hook_t *) secInfo->getAddress(); if (hooks != NULL) { for (size_t j = 0; j < entries_count; j++) { - wums_hook_t * hook = &hooks[j]; + wums_hook_t *hook = &hooks[j]; DEBUG_FUNCTION_LINE("Saving hook of type %08X, target: %08X"/*,pluginData.getPluginInformation()->getName().c_str()*/, hook->type, hook->target); HookData hook_data(hook->type, hook->target); moduleData.addHookData(hook_data); @@ -184,12 +184,13 @@ std::optional ModuleDataFactory::load(std::string path, uint32_t* de if (key.compare("export_name") == 0) { DEBUG_FUNCTION_LINE("export_name = %s", value.c_str()); moduleData.setExportName(value); - }else if (key.compare("initBeforeEntrypoint") == 0) { + } else if (key.compare("initBeforeEntrypoint") == 0) { if (value.compare("true") == 0) { DEBUG_FUNCTION_LINE("initBeforeEntrypoint = %s", value.c_str()); moduleData.setInitBeforeEntrypoint(true); } - }if (key.compare("wums") == 0) { + } + if (key.compare("wums") == 0) { if (value.compare("0.1") != 0) { DEBUG_FUNCTION_LINE("Warning: Ignoring module - Unsupported WUMS version: %s.\n", value.c_str()); return std::nullopt; @@ -201,8 +202,8 @@ std::optional ModuleDataFactory::load(std::string path, uint32_t* de } } - DCFlushRange((void*)*destination_address_ptr, totalSize); - ICInvalidateRange((void*)*destination_address_ptr, totalSize); + DCFlushRange((void *) *destination_address_ptr, totalSize); + ICInvalidateRange((void *) *destination_address_ptr, totalSize); free(destinations); @@ -250,7 +251,7 @@ std::vector ModuleDataFactory::getImportRelocationData(elfio &re } // uint32_t adjusted_sym_value = (uint32_t) sym_value; - if(infoMap.count(sym_section_index) == 0){ + if (infoMap.count(sym_section_index) == 0) { continue; } std::optional rplInfo = ImportRPLInformation::createImportRPLInformation(infoMap[sym_section_index]); diff --git a/source/module/ModuleDataFactory.h b/source/module/ModuleDataFactory.h index e930710..2306ad7 100644 --- a/source/module/ModuleDataFactory.h +++ b/source/module/ModuleDataFactory.h @@ -26,7 +26,7 @@ class ModuleDataFactory { public: - static std::optional load(std::string path, uint32_t* destination_address_ptr, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length); + static std::optional load(std::string path, uint32_t *destination_address_ptr, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length); static bool linkSection(ELFIO::elfio &reader, uint32_t section_index, uint32_t destination, uint32_t base_text, uint32_t base_data, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length);