am d2aea929: am f595365f: am d5f97db5: Merge "libion: Use %zu for size_t"

* commit 'd2aea929bfccf00dc0242e24ca13b29f6eaeb892':
  libion: Use %zu for size_t
This commit is contained in:
Elliott Hughes 2013-12-13 17:50:54 +00:00 committed by Android Git Automerger
commit d27f65bada

View file

@ -73,7 +73,7 @@ void ion_map_test()
} }
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
if (ptr[i] != (unsigned char)i) if (ptr[i] != (unsigned char)i)
printf("%s failed wrote %d read %d from mapped " printf("%s failed wrote %zu read %d from mapped "
"memory\n", __func__, i, ptr[i]); "memory\n", __func__, i, ptr[i]);
/* clean up properly */ /* clean up properly */
ret = ion_free(fd, handle); ret = ion_free(fd, handle);
@ -257,7 +257,7 @@ int main(int argc, char* argv[]) {
break; break;
} }
} }
printf("test %d, len %u, align %u, map_flags %d, prot %d, heap_mask %d," printf("test %d, len %zu, align %zu, map_flags %d, prot %d, heap_mask %d,"
" alloc_flags %d\n", test, len, align, map_flags, prot, " alloc_flags %d\n", test, len, align, map_flags, prot,
heap_mask, alloc_flags); heap_mask, alloc_flags);
switch (test) { switch (test) {