[llvm-commits] [llvm] r121975 - /llvm/trunk/tools/llvm-dis/llvm-dis.cpp

[Michael J. Spencer]

Author: mspencer
Date: Thu Dec 16 10:23:38 2010
New Revision: 121975

URL: http://llvm.org/viewvc/llvm-project?rev=121975&view=rev
Log:
llvm-dis: Simplify MemoryBuffer usage.

Modified:
    llvm/trunk/tools/llvm-dis/llvm-dis.cpp

Modified: llvm/trunk/tools/llvm-dis/llvm-dis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dis/llvm-dis.cpp?rev=121975&r1=121974&r2=121975&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-dis/llvm-dis.cpp (original)
+++ llvm/trunk/tools/llvm-dis/llvm-dis.cpp Thu Dec 16 10:23:38 2010
@@ -79,15 +79,13 @@
   cl::ParseCommandLineOptions(argc, argv, "llvm .bc -> .ll disassembler\n");
 
   std::string ErrorMessage;
-  error_code ec;
   std::auto_ptr<Module> M;
   OwningPtr<MemoryBuffer> BufferPtr;
 
-  if ((ec = MemoryBuffer::getFileOrSTDIN(InputFilename, BufferPtr)))
+  if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputFilename, BufferPtr))
     ErrorMessage = ec.message();
   else
-    M.reset(ParseBitcodeFile(BufferPtr.get(), Context, &ErrorMessage));
-  (void) BufferPtr.take();
+    M.reset(ParseBitcodeFile(BufferPtr.take(), Context, &ErrorMessage));
 
   if (M.get() == 0) {
     errs() << argv[0] << ": ";