summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-10-04 07:28:20 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-04 07:28:20 -0700
commita2b0e612284b05b121daaf0a33e3c6698b874741 (patch)
tree72e708ec7418fce9aaab77501a4cc9be82766f15 /include
parentae4bfa97edc37a8a9e9db2a5bdb35be9c4ba13ed (diff)
parentdbf6f272a2cad97f7ce7fa600ffd2220483c80d1 (diff)
downloadframeworks_native-a2b0e612284b05b121daaf0a33e3c6698b874741.zip
frameworks_native-a2b0e612284b05b121daaf0a33e3c6698b874741.tar.gz
frameworks_native-a2b0e612284b05b121daaf0a33e3c6698b874741.tar.bz2
Merge "ZipFileRO: moar logging and wrap close" into gingerbread
Diffstat (limited to 'include')
-rw-r--r--include/utils/ZipFileRO.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/include/utils/ZipFileRO.h b/include/utils/ZipFileRO.h
index 9668bde..e1ff780 100644
--- a/include/utils/ZipFileRO.h
+++ b/include/utils/ZipFileRO.h
@@ -64,15 +64,8 @@ public:
mNumEntries(-1), mDirectoryOffset(-1),
mHashTableSize(-1), mHashTable(NULL)
{}
- ~ZipFileRO() {
- free(mHashTable);
- if (mDirectoryMap)
- mDirectoryMap->release();
- if (mFd >= 0)
- close(mFd);
- if (mFileName)
- free(mFileName);
- }
+
+ ~ZipFileRO();
/*
* Open an archive.