Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 571180c4: Merge "Attempt to fix the SDK build" into gingerbread

Browse Source 
Merge commit '571180c4c72e0bb4f930f8971edf000a652f10f6' into gingerbread-plus-aosp

* commit '571180c4c72e0bb4f930f8971edf000a652f10f6':
  Attempt to fix the SDK build
This commit is contained in:
Christopher Tate
2010-07-29 13:58:00 -07:00
committed by Android Git Automerger
parent 9c7054119a 571180c4c7
commit 06abd0a6a8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/utils/StreamingZipInflater.cpp
View File

@@ -23,7 +23,7 @@
#include <stddef.h> #include <stddef.h>
#include <assert.h> #include <assert.h>
static inline size_t min(size_t a, size_t b) { return (a < b) ? a : b; } static inline size_t min_of(size_t a, size_t b) { return (a < b) ? a : b; }
using namespace android; using namespace android;
@@ -116,10 +116,10 @@ void StreamingZipInflater::initInflateState() {
ssize_t StreamingZipInflater::read(void* outBuf, size_t count) { ssize_t StreamingZipInflater::read(void* outBuf, size_t count) {
uint8_t* dest = (uint8_t*) outBuf; uint8_t* dest = (uint8_t*) outBuf;
size_t bytesRead = 0; size_t bytesRead = 0;
size_t toRead = min(count, size_t(mOutTotalSize - mOutCurPosition)); size_t toRead = min_of(count, size_t(mOutTotalSize - mOutCurPosition));
while (toRead > 0) { while (toRead > 0) {
// First, write from whatever we already have decoded and ready to go // First, write from whatever we already have decoded and ready to go
size_t deliverable = min(toRead, mOutLastDecoded - mOutDeliverable); size_t deliverable = min_of(toRead, mOutLastDecoded - mOutDeliverable);
if (deliverable > 0) { if (deliverable > 0) {
if (outBuf != NULL) memcpy(dest, mOutBuf + mOutDeliverable, deliverable); if (outBuf != NULL) memcpy(dest, mOutBuf + mOutDeliverable, deliverable);
mOutDeliverable += deliverable; mOutDeliverable += deliverable;
@@ -188,7 +188,7 @@ int StreamingZipInflater::readNextChunk() {
assert(mDataMap == NULL); assert(mDataMap == NULL);
if (mInNextChunkOffset < mInTotalSize) { if (mInNextChunkOffset < mInTotalSize) {
size_t toRead = min(mInBufSize, mInTotalSize - mInNextChunkOffset); size_t toRead = min_of(mInBufSize, mInTotalSize - mInNextChunkOffset);
if (toRead > 0) { if (toRead > 0) {
ssize_t didRead = ::read(mFd, mInBuf, toRead); ssize_t didRead = ::read(mFd, mInBuf, toRead);
//LOGD("Reading input chunk, size %08x didread %08x", toRead, didRead); //LOGD("Reading input chunk, size %08x didread %08x", toRead, didRead);