Cleanup the formatting of obj2yaml.cpp.

I couldn't touch this file and not clean it up some. These reformattings
brought to you by clang-format, with some minor adjustments by me. More
spring cleaning to follow here.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179004 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chandler Carruth 2013-04-08 08:39:59 +00:00
parent bcff69a1e0
commit 724a7b145d

View File

@ -21,9 +21,9 @@ namespace yaml { // generic yaml-writing specific routines
unsigned char printable(unsigned char Ch) { unsigned char printable(unsigned char Ch) {
return Ch >= ' ' && Ch <= '~' ? Ch : '.'; return Ch >= ' ' && Ch <= '~' ? Ch : '.';
} }
llvm::raw_ostream &writeHexStream(llvm::raw_ostream &Out, llvm::raw_ostream &writeHexStream(llvm::raw_ostream &Out,
const llvm::ArrayRef<uint8_t> arr) { const llvm::ArrayRef<uint8_t> arr) {
const char *hex = "0123456789ABCDEF"; const char *hex = "0123456789ABCDEF";
Out << " !hex \""; Out << " !hex \"";
@ -38,9 +38,10 @@ llvm::raw_ostream &writeHexStream(llvm::raw_ostream &Out,
Out << "|\n"; Out << "|\n";
return Out; return Out;
} }
llvm::raw_ostream &writeHexNumber(llvm::raw_ostream &Out, unsigned long long N) { llvm::raw_ostream &writeHexNumber(llvm::raw_ostream &Out,
unsigned long long N) {
if (N >= 10) if (N >= 10)
Out << "0x"; Out << "0x";
Out.write_hex(N); Out.write_hex(N);
@ -49,32 +50,32 @@ llvm::raw_ostream &writeHexNumber(llvm::raw_ostream &Out, unsigned long long N)
} }
using namespace llvm; using namespace llvm;
enum ObjectFileType { coff }; enum ObjectFileType {
coff
};
cl::opt<ObjectFileType> InputFormat( cl::opt<ObjectFileType> InputFormat(
cl::desc("Choose input format"), cl::desc("Choose input format"),
cl::values( cl::values(clEnumVal(coff, "process COFF object files"), clEnumValEnd));
clEnumVal(coff, "process COFF object files"),
clEnumValEnd));
cl::opt<std::string> InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-"));
int main(int argc, char * argv[]) { cl::opt<std::string> InputFilename(cl::Positional, cl::desc("<input file>"),
cl::init("-"));
int main(int argc, char *argv[]) {
cl::ParseCommandLineOptions(argc, argv); cl::ParseCommandLineOptions(argc, argv);
sys::PrintStackTraceOnErrorSignal(); sys::PrintStackTraceOnErrorSignal();
PrettyStackTraceProgram X(argc, argv); PrettyStackTraceProgram X(argc, argv);
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
// Process the input file // Process the input file
OwningPtr<MemoryBuffer> buf; OwningPtr<MemoryBuffer> buf;
// TODO: If this is an archive, then burst it and dump each entry // TODO: If this is an archive, then burst it and dump each entry
if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputFilename, buf)) if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputFilename, buf)) {
llvm::errs() << "Error: '" << ec.message() << "' opening file '" llvm::errs() << "Error: '" << ec.message() << "' opening file '"
<< InputFilename << "'\n"; << InputFilename << "'\n";
else { } else {
ec = coff2yaml(llvm::outs(), buf.take()); ec = coff2yaml(llvm::outs(), buf.take());
if (ec) if (ec)
llvm::errs() << "Error: " << ec.message() << " dumping COFF file\n"; llvm::errs() << "Error: " << ec.message() << " dumping COFF file\n";