diff options
| author | Kenny Root <kroot@google.com> | 2010-10-04 07:41:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 07:41:11 -0700 |
| commit | ac7540733cafcca5bdb1842e1ebcb396ba064583 (patch) | |
| tree | 3d155d892096e2f1a02119eb94a0bd775e3de687 /include | |
| parent | 1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99 (diff) | |
| parent | b58b27142a936aa76897a7040c08b8a0989a685b (diff) | |
| download | frameworks_base-ac7540733cafcca5bdb1842e1ebcb396ba064583.zip frameworks_base-ac7540733cafcca5bdb1842e1ebcb396ba064583.tar.gz frameworks_base-ac7540733cafcca5bdb1842e1ebcb396ba064583.tar.bz2 | |
am b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbread
Merge commit 'b58b27142a936aa76897a7040c08b8a0989a685b' into gingerbread-plus-aosp
* commit 'b58b27142a936aa76897a7040c08b8a0989a685b':
ZipFileRO: moar logging and wrap close
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/ZipFileRO.h | 11 |
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. |