commit b7bbba49d88eae58223d9878da4069bf6d7140bf
author Brian Carlstrom <bdc@google.com> Thu Oct 13 14:58:47 2011 -0700
committer Brian Carlstrom <bdc@google.com> Fri Oct 14 00:24:28 2011 -0700
tree 00d1a0758d762903e648bb550434320822228c46
parent 30646836b4a1c6e5e80ddaea246cf9669eaa0628

Add oatopt drop in replacement for dexopt

Change-Id: I094375230af2d9a88e30245b390cac71be7b50f4

src/zip_archive.cc

diff --git a/src/zip_archive.cc b/src/zip_archive.cc
index 82d97ec..41a25de 100644
--- a/src/zip_archive.cc
+++ b/src/zip_archive.cc
@@ -257,7 +257,6 @@
   }
 }
 
-// return new ZipArchive instance on success, NULL on error.
 ZipArchive* ZipArchive::Open(const std::string& filename) {
   DCHECK(!filename.empty());
   int fd = open(filename.c_str(), O_RDONLY | O_CLOEXEC, 0);
@@ -265,6 +264,10 @@
     PLOG(WARNING) << "Unable to open '" << filename << "'";
     return NULL;
   }
+  return Open(fd);
+}
+
+ZipArchive* ZipArchive::Open(int fd) {
   UniquePtr<ZipArchive> zip_archive(new ZipArchive(fd));
   if (zip_archive.get() == NULL) {
       return NULL;