[llvm-commits] CVS: llvm/tools/llvm-link/llvm-link.cpp

[Chris Lattner]

Changes in directory llvm/tools/llvm-link:

llvm-link.cpp updated: 1.66 -> 1.67
---
Log message:

use the new MemoryBuffer interfaces to simplify error reporting in clients.


---
Diffs of the changes:  (+4 -6)

 llvm-link.cpp |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


Index: llvm/tools/llvm-link/llvm-link.cpp
diff -u llvm/tools/llvm-link/llvm-link.cpp:1.66 llvm/tools/llvm-link/llvm-link.cpp:1.67
--- llvm/tools/llvm-link/llvm-link.cpp:1.66	Sun May  6 18:23:17 2007
+++ llvm/tools/llvm-link/llvm-link.cpp	Sun May  6 18:45:49 2007
@@ -58,13 +58,11 @@
     Module* Result = 0;
     
     const std::string &FNStr = Filename.toString();
-    MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&FNStr[0],
-                                                        FNStr.size());
-    if (Buffer == 0)
-      ErrorMessage = "Error reading file '" + FNStr + "'";
-    else
+    if (MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(FNStr,
+                                                            &ErrorMessage)) {
       Result = ParseBitcodeFile(Buffer, &ErrorMessage);
-    delete Buffer;
+      delete Buffer;
+    }
     if (Result) return std::auto_ptr<Module>(Result);   // Load successful!
 
     if (Verbose) {