From df4fdd6f1ed6610fba4a2898a11f53426bea437a Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 22 Oct 2018 00:29:35 +0200 Subject: [PATCH] printf format fixups in ELFLoader. --- ELFLoader/ELFImage.cpp | 6 +++--- ELFLoader/ELFLoader.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ELFLoader/ELFImage.cpp b/ELFLoader/ELFImage.cpp index 092ff94e1c9..adeab3ba4d2 100644 --- a/ELFLoader/ELFImage.cpp +++ b/ELFLoader/ELFImage.cpp @@ -47,7 +47,7 @@ unsigned ELFImage::symbolCount() const void ELFImage::dump() { - kprintf("AK::ELFImage{%p} {\n", this); + kprintf("ELFImage{%p} {\n", this); kprintf(" isValid: %u\n", isValid()); if (!isValid()) { @@ -57,7 +57,7 @@ void ELFImage::dump() kprintf(" type: %s\n", objectFileTypeToString(header().e_type)); kprintf(" machine: %u\n", header().e_machine); - kprintf(" entry: %08x\n", header().e_entry); + kprintf(" entry: %x\n", header().e_entry); kprintf(" shoff: %u\n", header().e_shoff); kprintf(" shnum: %u\n", header().e_shnum); kprintf(" shstrndx: %u\n", header().e_shstrndx); @@ -79,7 +79,7 @@ void ELFImage::dump() kprintf("Symbol @%u:\n", i); kprintf(" Name: %s\n", sym.name()); kprintf(" In section: %s\n", sectionIndexToString(sym.sectionIndex())); - kprintf(" Value: %08x\n", sym.value()); + kprintf(" Value: %x\n", sym.value()); kprintf(" Size: %u\n", sym.size()); } diff --git a/ELFLoader/ELFLoader.cpp b/ELFLoader/ELFLoader.cpp index 6b5b0c928b7..bfbd4bbbee6 100644 --- a/ELFLoader/ELFLoader.cpp +++ b/ELFLoader/ELFLoader.cpp @@ -75,7 +75,7 @@ void ELFLoader::performRelocations() case R_386_PC32: { char* targetPtr = (char*)lookup(symbol); ptrdiff_t relativeOffset = (char*)targetPtr - ((char*)&patchPtr + 4); - kprintf("[ELFLoader] Relocate PC32: offset=%08x, symbol=%u(%s) value=%08x target=%p, offset=%d\n", + kprintf("[ELFLoader] Relocate PC32: offset=%x, symbol=%u(%s) value=%x target=%p, offset=%d\n", relocation.offset(), symbol.index(), symbol.name(), @@ -87,7 +87,7 @@ void ELFLoader::performRelocations() break; } case R_386_32: { - kprintf("[ELFLoader] Relocate Abs32: symbol=%u(%s), value=%08x, section=%s\n", + kprintf("[ELFLoader] Relocate Abs32: symbol=%u(%s), value=%x, section=%s\n", symbol.index(), symbol.name(), symbol.value(),