diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-16 17:54:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-16 17:54:01 -0700 |
| commit | 3d88fc00b32cc4c093dd5ef3f8f349966df948ad (patch) | |
| tree | da4b25083bf09b01b0b62a4e1017b38c5eea000d /libs/utils | |
| parent | 53245df9c1c2ec52f8d39db77dae890b63b51aa2 (diff) | |
| parent | 3e1663a2539ff0b939193304cfb601f6b134af7d (diff) | |
| download | frameworks_base-3d88fc00b32cc4c093dd5ef3f8f349966df948ad.zip frameworks_base-3d88fc00b32cc4c093dd5ef3f8f349966df948ad.tar.gz frameworks_base-3d88fc00b32cc4c093dd5ef3f8f349966df948ad.tar.bz2 | |
am 3e1663a2: Merge change 7536 into donut
Merge commit '3e1663a2539ff0b939193304cfb601f6b134af7d'
* commit '3e1663a2539ff0b939193304cfb601f6b134af7d':
fix FILE* version of ZipUtils::inflateToBuffer
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/ZipUtils.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/utils/ZipUtils.cpp b/libs/utils/ZipUtils.cpp index 5df94cb..9138878 100644 --- a/libs/utils/ZipUtils.cpp +++ b/libs/utils/ZipUtils.cpp @@ -210,7 +210,7 @@ bail: LOGV("+++ reading %ld bytes (%ld left)\n", getSize, compRemaining); - int cc = fread(readBuf, getSize, 1, fp); + int cc = fread(readBuf, 1, getSize, fp); if (cc != (int) getSize) { LOGD("inflate read failed (%d vs %ld)\n", cc, getSize); @@ -341,4 +341,3 @@ bail: return true; } - |