Fix several compiler warnings

This commit is contained in:
Maschell 2020-06-01 16:41:46 +02:00
parent 985691e608
commit 2442bb46c5
7 changed files with 9 additions and 10 deletions

View File

@ -38,7 +38,7 @@ std::vector<ModuleData> ModuleDataPersistence::loadModuleData(module_information
for (uint32_t j = 0; j < EXPORT_ENTRY_LIST_LENGTH; j++) {
export_data_t *export_entry = &(module_data->export_entries[j]);
if (export_entry->address == NULL) {
if (export_entry->address == 0) {
continue;
}
moduleData.addExportData(ExportData(static_cast<wums_entry_type_t>(export_entry->type), export_entry->name, reinterpret_cast<const void *>(export_entry->address)));
@ -46,7 +46,7 @@ std::vector<ModuleData> ModuleDataPersistence::loadModuleData(module_information
for (uint32_t j = 0; j < HOOK_ENTRY_LIST_LENGTH; j++) {
hook_data_t *hook_entry = &(module_data->hook_entries[j]);
if (hook_entry->target == NULL) {
if (hook_entry->target == 0) {
continue;
}
moduleData.addHookData(HookData(static_cast<wums_hook_type_t>(hook_entry->type), reinterpret_cast<const void *>(hook_entry->target)));

View File

@ -97,7 +97,6 @@ bool doRelocation(std::vector<RelocationData> &relocData, relocation_trampolin_e
bool ResolveRelocations(const std::vector<ModuleData> &loadedModules, bool replaceAllocFunctions) {
bool wasSuccessful = true;
uint32_t count = 0;
for (auto const &curModule : loadedModules) {
DEBUG_FUNCTION_LINE("Let's do the relocations for %s\n", curModule.getExportName().c_str());

View File

@ -20,7 +20,7 @@ void CallHook(const std::vector<ModuleData> &modules, wums_hook_type_t type) {
curHook.getType() == WUMS_HOOK_INIT_WUT ||
curHook.getType() == WUMS_HOOK_FINI_WUT) {
uint32_t func_ptr = (uint32_t) curHook.getTarget();
if (func_ptr == NULL) {
if (func_ptr == 0) {
DEBUG_FUNCTION_LINE("Hook ptr was NULL\n");
} else {
DEBUG_FUNCTION_LINE("Calling for module [%s]\n", curModule.getExportName().c_str());

View File

@ -11,7 +11,7 @@ public:
this->address = address;
}
const wums_entry_type_t getType() const {
wums_entry_type_t getType() const {
return type;
}

View File

@ -9,7 +9,7 @@ public:
this->target = target;
}
const wums_hook_type_t getType() const {
wums_hook_type_t getType() const {
return type;
}

View File

@ -31,7 +31,7 @@ bool ModuleDataPersistence::saveModuleData(module_information_t *moduleInformati
bool found = false;
for (uint32_t j = 0; j < EXPORT_ENTRY_LIST_LENGTH; j++) {
export_data_t *export_entry = &(module_data->export_entries[j]);
if (export_entry->address == NULL) {
if (export_entry->address == 0) {
export_entry->type = curExport.getType();
strncpy(export_entry->name, curExport.getName().c_str(), EXPORT_MAXIMUM_NAME_LENGTH);
export_entry->address = (uint32_t) curExport.getAddress();
@ -50,7 +50,7 @@ bool ModuleDataPersistence::saveModuleData(module_information_t *moduleInformati
bool found = false;
for (uint32_t j = 0; j < HOOK_ENTRY_LIST_LENGTH; j++) {
hook_data_t *hook_entry = &(module_data->hook_entries[j]);
if (hook_entry->target == NULL) {
if (hook_entry->target == 0) {
hook_entry->type = curHook.getType();
hook_entry->target = (uint32_t) curHook.getTarget();
found = true;

View File

@ -46,11 +46,11 @@ public:
return name;
}
const uint32_t getAddress() const {
uint32_t getAddress() const {
return address;
}
const uint32_t getSize() const {
uint32_t getSize() const {
return sectionSize;
}