commit d9da7a1f160d32520791e89db9184bfa4d5f35f7
author Michael J. Spencer <bigcheesegs@gmail.com> Thu Dec 16 03:28:14 2010 +0000
committer Michael J. Spencer <bigcheesegs@gmail.com> Thu Dec 16 03:28:14 2010 +0000
tree a44445cf75cef436112f1657a2037227043ae54e
parent 4030ff79b126175c2ca160d1d9db8a9020636671

MemoryBuffer API update.

llvm-svn: 121956

clang/lib/Driver/ToolChains.cpp

diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 9af6263..e292c8f 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -1244,11 +1244,9 @@
 }
 
 static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
-  llvm::error_code ec;
-  llvm::OwningPtr<const llvm::MemoryBuffer>
-    LsbRelease(llvm::MemoryBuffer::getFile("/etc/lsb-release", ec));
-  if (LsbRelease) {
-    llvm::StringRef Data = LsbRelease.get()->getBuffer();
+  llvm::OwningPtr<llvm::MemoryBuffer> File;
+  if (!llvm::MemoryBuffer::getFile("/etc/lsb-release", File)) {
+    llvm::StringRef Data = File.get()->getBuffer();
     llvm::SmallVector<llvm::StringRef, 8> Lines;
     Data.split(Lines, "\n");
     for (unsigned int i = 0, s = Lines.size(); i < s; ++ i) {
@@ -1257,17 +1255,15 @@
       else if (Lines[i] == "DISTRIB_CODENAME=lucid")
         return UbuntuLucid;
       else if (Lines[i] == "DISTRIB_CODENAME=jaunty")
-	return UbuntuJaunty;
+        return UbuntuJaunty;
       else if (Lines[i] == "DISTRIB_CODENAME=karmic")
         return UbuntuKarmic;
     }
     return UnknownDistro;
   }
 
-  llvm::OwningPtr<const llvm::MemoryBuffer>
-    RHRelease(llvm::MemoryBuffer::getFile("/etc/redhat-release", ec));
-  if (RHRelease) {
-    llvm::StringRef Data = RHRelease.get()->getBuffer();
+  if (!llvm::MemoryBuffer::getFile("/etc/redhat-release", File)) {
+    llvm::StringRef Data = File.get()->getBuffer();
     if (Data.startswith("Fedora release 14 (Laughlin)"))
       return Fedora14;
     else if (Data.startswith("Fedora release 13 (Goddard)"))
@@ -1275,10 +1271,8 @@
     return UnknownDistro;
   }
 
-  llvm::OwningPtr<const llvm::MemoryBuffer>
-    DebianVersion(llvm::MemoryBuffer::getFile("/etc/debian_version", ec));
-  if (DebianVersion) {
-    llvm::StringRef Data = DebianVersion.get()->getBuffer();
+  if (!llvm::MemoryBuffer::getFile("/etc/debian_version", File)) {
+    llvm::StringRef Data = File.get()->getBuffer();
     if (Data[0] == '5')
       return DebianLenny;
     else if (Data.startswith("squeeze/sid"))
@@ -1286,10 +1280,8 @@
     return UnknownDistro;
   }
 
-  llvm::OwningPtr<const llvm::MemoryBuffer>
-    SuseRelease(llvm::MemoryBuffer::getFile("/etc/SuSE-release", ec));
-  if (SuseRelease) {
-    llvm::StringRef Data = SuseRelease.get()->getBuffer();
+  if (!llvm::MemoryBuffer::getFile("/etc/SuSE-release", File)) {
+    llvm::StringRef Data = File.get()->getBuffer();
     if (Data.startswith("openSUSE 11.3"))
       return OpenSuse11_3;
     return UnknownDistro;