[llvm] r179004 - Cleanup the formatting of obj2yaml.cpp.

Rafael EspĂ­ndola rafael.espindola at gmail.com
Mon Apr 8 05:46:15 PDT 2013


Thanks!

On 8 April 2013 04:40, Chandler Carruth <chandlerc at gmail.com> wrote:
> Author: chandlerc
> Date: Mon Apr  8 03:39:59 2013
> New Revision: 179004
>
> URL: http://llvm.org/viewvc/llvm-project?rev=179004&view=rev
> Log:
> 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.
>
> Modified:
>     llvm/trunk/tools/obj2yaml/obj2yaml.cpp
>
> Modified: llvm/trunk/tools/obj2yaml/obj2yaml.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/obj2yaml.cpp?rev=179004&r1=179003&r2=179004&view=diff
> ==============================================================================
> --- llvm/trunk/tools/obj2yaml/obj2yaml.cpp (original)
> +++ llvm/trunk/tools/obj2yaml/obj2yaml.cpp Mon Apr  8 03:39:59 2013
> @@ -21,9 +21,9 @@ namespace yaml {  // generic yaml-writin
>  unsigned char printable(unsigned char Ch) {
>    return Ch >= ' ' && Ch <= '~' ? Ch : '.';
>  }
> -
> -llvm::raw_ostream &writeHexStream(llvm::raw_ostream &Out,
> -                                     const llvm::ArrayRef<uint8_t> arr) {
> +
> +llvm::raw_ostream &writeHexStream(llvm::raw_ostream &Out,
> +                                  const llvm::ArrayRef<uint8_t> arr) {
>    const char *hex = "0123456789ABCDEF";
>    Out << " !hex \"";
>
> @@ -38,9 +38,10 @@ llvm::raw_ostream &writeHexStream(llvm::
>    Out << "|\n";
>
>    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)
>      Out << "0x";
>    Out.write_hex(N);
> @@ -49,32 +50,32 @@ llvm::raw_ostream &writeHexNumber(llvm::
>
>  }
>
> -
>  using namespace llvm;
> -enum ObjectFileType { coff };
> +enum ObjectFileType {
> +  coff
> +};
>
>  cl::opt<ObjectFileType> InputFormat(
> -  cl::desc("Choose input format"),
> -    cl::values(
> -      clEnumVal(coff, "process COFF object files"),
> -    clEnumValEnd));
> -
> -cl::opt<std::string> InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-"));
> +    cl::desc("Choose input format"),
> +    cl::values(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[]) {
> +int main(int argc, char *argv[]) {
>    cl::ParseCommandLineOptions(argc, argv);
>    sys::PrintStackTraceOnErrorSignal();
>    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;
>
> -// TODO: If this is an archive, then burst it and dump each entry
> -  if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputFilename, buf))
> -    llvm::errs() << "Error: '" << ec.message() << "' opening file '"
> -              << InputFilename << "'\n";
> -  else {
> +  // TODO: If this is an archive, then burst it and dump each entry
> +  if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputFilename, buf)) {
> +    llvm::errs() << "Error: '" << ec.message() << "' opening file '"
> +                 << InputFilename << "'\n";
> +  } else {
>      ec = coff2yaml(llvm::outs(), buf.take());
>      if (ec)
>        llvm::errs() << "Error: " << ec.message() << " dumping COFF file\n";
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



More information about the llvm-commits mailing list