summaryrefslogtreecommitdiffstats
path: root/libs/androidfw/ZipUtils.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-03-19 11:00:06 -0700
committerMark Salyzyn <salyzyn@google.com>2014-03-19 11:11:14 -0700
commit00adb8685ee996f9d2650d617c8c0e98f13ef406 (patch)
treeb3bd40533e240cd3258de89c9541037c16f9fadd /libs/androidfw/ZipUtils.cpp
parent7cb1dfe690b2d700ce212712287dfd59c2c8e43f (diff)
downloadframeworks_base-00adb8685ee996f9d2650d617c8c0e98f13ef406.zip
frameworks_base-00adb8685ee996f9d2650d617c8c0e98f13ef406.tar.gz
frameworks_base-00adb8685ee996f9d2650d617c8c0e98f13ef406.tar.bz2
androidfw: resolve 64-bit build issues
- uid_t/gid_t cast to unsigned long - unused argument warnings - tab and space requirements Change-Id: Ib446d8165b9082be02edb55e6b71fd1a03ea3431
Diffstat (limited to 'libs/androidfw/ZipUtils.cpp')
-rw-r--r--libs/androidfw/ZipUtils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/ZipUtils.cpp b/libs/androidfw/ZipUtils.cpp
index e9ac2fe..6fa0f14 100644
--- a/libs/androidfw/ZipUtils.cpp
+++ b/libs/androidfw/ZipUtils.cpp
@@ -127,7 +127,7 @@ static const unsigned long kReadBufSize = 32768;
goto z_bail;
}
- /* output buffer holds all, so no need to write the output */
+ /* output buffer holds all, so no need to write the output */
} while (zerr == Z_OK);
assert(zerr == Z_STREAM_END); /* other errors should've been caught */
@@ -197,7 +197,7 @@ public:
{
}
- long read(unsigned char** nextBuffer, long readSize) {
+ long read(unsigned char** nextBuffer, long /*readSize*/) {
if (!mBufferReturned) {
mBufferReturned = true;
*nextBuffer = mInput;