commit 90a3369d3b6238f1a4c9b19ca68978dab1c39bc4
author Elliott Hughes <enh@google.com> Tue Aug 30 13:27:07 2011 -0700
committer Elliott Hughes <enh@google.com> Tue Aug 30 13:27:45 2011 -0700
tree b66ec9b2cced5713bd5902c499d57b533d2e7a9a
parent 34023801bd544e613d6e85c9a5b2e743f3710e8f

Switch to UniquePtr.

Only one use of scoped_ptr was incorrect (but then again, I spent an afternoon
with valgrind finding and fixing them just last week).

Change-Id: If5ec1c8aa0794a4f652bfd1c0fffccf95facdc40

src/zip_archive.cc

diff --git a/src/zip_archive.cc b/src/zip_archive.cc
index cccaf82..8c77391 100644
--- a/src/zip_archive.cc
+++ b/src/zip_archive.cc
@@ -21,6 +21,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "UniquePtr.h"
+
 namespace art {
 
 // Get 2 little-endian bytes.
@@ -160,13 +162,13 @@
 
 static bool InflateToFile(File& out, int in, size_t uncompressed_length, size_t compressed_length) {
   const size_t kBufSize = 32768;
-  scoped_array<uint8_t> read_buf(new uint8_t[kBufSize]);
-  scoped_array<uint8_t> write_buf(new uint8_t[kBufSize]);
-  if (read_buf == NULL || write_buf == NULL) {
+  UniquePtr<uint8_t[]> read_buf(new uint8_t[kBufSize]);
+  UniquePtr<uint8_t[]> write_buf(new uint8_t[kBufSize]);
+  if (read_buf.get() == NULL || write_buf.get() == NULL) {
     return false;
   }
 
-  scoped_ptr<ZStream> zstream(new ZStream(write_buf.get(), kBufSize));
+  UniquePtr<ZStream> zstream(new ZStream(write_buf.get(), kBufSize));
 
   // Use the undocumented "negative window bits" feature to tell zlib
   // that there's no zlib header waiting for it.
@@ -263,8 +265,8 @@
     PLOG(WARNING) << "Unable to open '" << filename << "'";
     return NULL;
   }
-  scoped_ptr<ZipArchive> zip_archive(new ZipArchive(fd));
-  if (zip_archive == NULL) {
+  UniquePtr<ZipArchive> zip_archive(new ZipArchive(fd));
+  if (zip_archive.get() == NULL) {
       return NULL;
   }
   if (!zip_archive->MapCentralDirectory()) {
@@ -327,8 +329,8 @@
       read_amount = file_length;
   }
 
-  scoped_array<uint8_t> scan_buf(new uint8_t[read_amount]);
-  if (scan_buf == NULL) {
+  UniquePtr<uint8_t[]> scan_buf(new uint8_t[read_amount]);
+  if (scan_buf.get() == NULL) {
     return false;
   }
 
@@ -385,7 +387,7 @@
 
   // It all looks good.  Create a mapping for the CD.
   dir_map_.reset(MemMap::Map(dir_size, PROT_READ, MAP_SHARED, fd_, dir_offset));
-  if (dir_map_ == NULL) {
+  if (dir_map_.get() == NULL) {
     return false;
   }