diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-09 00:48:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-09 00:48:11 +0000 |
| commit | 5bbb52e8a4242efeea27921ac3e38cf6f9c56162 (patch) | |
| tree | 0b99c4cd441a7c42e0e3e3a3605162c4df5bbf8e /libs/androidfw/BackupData.cpp | |
| parent | 481fc7427b419efb98428f27c5b0e252183ff315 (diff) | |
| parent | 189bf05616b854f0319c7329a96e63ad374fd6c0 (diff) | |
| download | frameworks_base-5bbb52e8a4242efeea27921ac3e38cf6f9c56162.zip frameworks_base-5bbb52e8a4242efeea27921ac3e38cf6f9c56162.tar.gz frameworks_base-5bbb52e8a4242efeea27921ac3e38cf6f9c56162.tar.bz2 | |
am 189bf056: Merge "Frameworks/base: Fix more warnings"
* commit '189bf05616b854f0319c7329a96e63ad374fd6c0':
Frameworks/base: Fix more warnings
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
| -rw-r--r-- | libs/androidfw/BackupData.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libs/androidfw/BackupData.cpp b/libs/androidfw/BackupData.cpp index 2b45a70..ba4a4ff 100644 --- a/libs/androidfw/BackupData.cpp +++ b/libs/androidfw/BackupData.cpp @@ -45,12 +45,6 @@ static const bool kIsDebug = false; const static int ROUND_UP[4] = { 0, 3, 2, 1 }; static inline size_t -round_up(size_t n) -{ - return n + ROUND_UP[n % 4]; -} - -static inline size_t padding_extra(size_t n) { return ROUND_UP[n % 4]; @@ -343,7 +337,7 @@ BackupDataReader::ReadEntityData(void* data, size_t size) } int remaining = m_dataEndPos - m_pos; if (kIsDebug) { - ALOGD("ReadEntityData size=%d m_pos=0x%x m_dataEndPos=0x%x remaining=%d\n", + ALOGD("ReadEntityData size=%zu m_pos=0x%zx m_dataEndPos=0x%zx remaining=%d\n", size, m_pos, m_dataEndPos, remaining); } if (remaining <= 0) { @@ -353,7 +347,7 @@ BackupDataReader::ReadEntityData(void* data, size_t size) size = remaining; } if (kIsDebug) { - ALOGD(" reading %d bytes", size); + ALOGD(" reading %zu bytes", size); } int amt = read(m_fd, data, size); if (amt < 0) { |