diff options
author | Paul Semel <semelpaul@gmail.com> | 2018-07-01 11:54:09 +0000 |
---|---|---|
committer | Paul Semel <semelpaul@gmail.com> | 2018-07-01 11:54:09 +0000 |
commit | 2d07720488be48890c5700b118e58eed90d11388 (patch) | |
tree | 041ad9ba4c740daa7654b9c4334700ff153191ba /tools/llvm-readobj/ELFDumper.cpp | |
parent | 243c2fa15c2407d2f94c68e85fc3201e27a4746d (diff) |
Revert "[llvm-readobj] Fix printing format"
There is a problem with the formatting on windows build.
I need to investigate on this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@336061 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-readobj/ELFDumper.cpp')
-rw-r--r-- | tools/llvm-readobj/ELFDumper.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tools/llvm-readobj/ELFDumper.cpp b/tools/llvm-readobj/ELFDumper.cpp index 6bf7a811e64..9a2be3100ac 100644 --- a/tools/llvm-readobj/ELFDumper.cpp +++ b/tools/llvm-readobj/ELFDumper.cpp @@ -3275,11 +3275,6 @@ void GNUStyle<ELFT>::printProgramHeaders(const ELFO *Obj) { } } -void printAsPrintable(raw_ostream &W, StringRef S) { - for (char C : S) - W << (isprint(C) ? C : '.'); -} - template <class ELFT> void GNUStyle<ELFT>::printSectionAsString(const ELFO *Obj, StringRef SectionName) { @@ -3303,9 +3298,8 @@ void GNUStyle<ELFT>::printSectionAsString(const ELFO *Obj, CurrentWord++; continue; } - OS << format("[%6tx] ", CurrentWord - SecContent); - printAsPrintable(OS, StringRef(CurrentWord, WordSize)); - OS << '\n'; + OS << format("[%6tx]", CurrentWord - SecContent); + OS << format(" %.*s\n", WordSize, CurrentWord); CurrentWord += WordSize + 1; } OS.flush(); @@ -4367,9 +4361,8 @@ void LLVMStyle<ELFT>::printSectionAsString(const ELFO *Obj, W.startLine() << "[" << to_string( format_hex_no_prefix((CurrentWord - SecContent), 6)) - << "] "; - printAsPrintable(W.startLine(), StringRef(CurrentWord, WordSize)); - W.startLine() << '\n'; + << "]"; + W.startLine() << format(" %.*s\n", WordSize, CurrentWord); CurrentWord += WordSize + 1; } } |