diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-11 18:16:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:16:59 +0000 |
| commit | 2d895e6344f7999e98f05652f7679f2d96374b78 (patch) | |
| tree | 881da04e4767597f6ecbbf99663027669455cf5d /libs | |
| parent | 3489aa9a0da1288ac480fe2db1f7b7fe5ef1ab0e (diff) | |
| parent | 8fb22ae772fc62a10db6a06f283140d9233e8704 (diff) | |
| download | frameworks_base-2d895e6344f7999e98f05652f7679f2d96374b78.zip frameworks_base-2d895e6344f7999e98f05652f7679f2d96374b78.tar.gz frameworks_base-2d895e6344f7999e98f05652f7679f2d96374b78.tar.bz2 | |
am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"
* commit '8fb22ae772fc62a10db6a06f283140d9233e8704':
Various format string fixes for 64bit
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/BackupHelpers.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/androidfw/BackupHelpers.cpp b/libs/androidfw/BackupHelpers.cpp index b8d3f48..302fbf6 100644 --- a/libs/androidfw/BackupHelpers.cpp +++ b/libs/androidfw/BackupHelpers.cpp @@ -1083,7 +1083,7 @@ backup_helper_test_four() } if (readSnapshot.size() != 4) { - fprintf(stderr, "readSnapshot should be length 4 is %d\n", readSnapshot.size()); + fprintf(stderr, "readSnapshot should be length 4 is %zu\n", readSnapshot.size()); return 1; } @@ -1095,8 +1095,8 @@ backup_helper_test_four() if (name != filenames[i] || states[i].modTime_sec != state.modTime_sec || states[i].modTime_nsec != state.modTime_nsec || states[i].mode != state.mode || states[i].size != state.size || states[i].crc32 != states[i].crc32) { - fprintf(stderr, "state %d expected={%d/%d, 0x%08x, %04o, 0x%08x, %3d} '%s'\n" - " actual={%d/%d, 0x%08x, %04o, 0x%08x, %3d} '%s'\n", i, + fprintf(stderr, "state %zu expected={%d/%d, 0x%08x, %04o, 0x%08x, %3d} '%s'\n" + " actual={%d/%d, 0x%08x, %04o, 0x%08x, %3zu} '%s'\n", i, states[i].modTime_sec, states[i].modTime_nsec, states[i].mode, states[i].size, states[i].crc32, name.length(), filenames[i].string(), state.modTime_sec, state.modTime_nsec, state.mode, state.size, state.crc32, @@ -1230,7 +1230,7 @@ test_read_header_and_entity(BackupDataReader& reader, const char* str) goto finished; } if ((int)actualSize != bufSize) { - fprintf(stderr, "ReadEntityHeader expected dataSize 0x%08x got 0x%08x\n", bufSize, + fprintf(stderr, "ReadEntityHeader expected dataSize 0x%08x got 0x%08zx\n", bufSize, actualSize); err = EINVAL; goto finished; |