Fix warnings in system/extras.

Bug: http://b/26936282
Change-Id: I1b9c6c9bb06944c32abcb871279d056eea0fb11a

1 files changed, 6 insertions, 7 deletions

diff --git a/tests/pagingtest/thrashing_test.c b/tests/pagingtest/thrashing_test.c
index 165cd991..7ecd3ade 100644
--- a/tests/pagingtest/thrashing_test.c
+++ b/tests/pagingtest/thrashing_test.c
@@ -14,7 +14,6 @@ int thrashing_test(int test_runs) {
     int fds[4] = {-1, -1, -1, -1};
     char tmpnames[4][17] = { "thrashing1XXXXXX", "thrashing2XXXXXX", "thrashing3XXXXXX", "thrashing4XXXXXX" };
     volatile char *bufs[4] = {0};
-    unsigned i, j;
     long long k;
     int ret = -1;
     struct timeval begin_time, end_time, elapsed_time, total_time;
@@ -33,14 +32,14 @@ int thrashing_test(int test_runs) {
 
     filesize = num_pages * pagesize / (ARRAY_SIZE(fds) - 1);
 
-    for (i = 0; i < ARRAY_SIZE(fds); i++) {
+    for (size_t i = 0; i < ARRAY_SIZE(fds); i++) {
         fds[i] = create_tmp_file(tmpnames[i], filesize);
         if (fds[i] < 0) {
             goto err_fd;
         }
     }
 
-    for (i = 0; i < ARRAY_SIZE(fds); i++) {
+    for (size_t i = 0; i < ARRAY_SIZE(fds); i++) {
         bufs[i] = mmap(NULL, filesize, PROT_READ, MAP_PRIVATE, fds[i], 0);
         if (bufs[i] == ((void *)-1)) {
             fprintf(stderr, "Failed to mmap file: %s\n", strerror(errno));
@@ -48,8 +47,8 @@ int thrashing_test(int test_runs) {
         }
     }
 
-    for (i = 0; i < test_runs; i++) {
-        for (j = 0; j < ARRAY_SIZE(fds); j++) {
+    for (int i = 0; i < test_runs; i++) {
+        for (size_t j = 0; j < ARRAY_SIZE(fds); j++) {
             gettimeofday(&begin_time, NULL);
             //Unfortunately when under memory pressure, fadvise and madvise stop working...
             //Read backwards to prevent mmap prefetching
@@ -69,11 +68,11 @@ int thrashing_test(int test_runs) {
     ret = 0;
 
 err:
-    for (i = 0; i < ARRAY_SIZE(bufs) && bufs[i] != NULL; i++) {
+    for (size_t i = 0; i < ARRAY_SIZE(bufs) && bufs[i] != NULL; i++) {
         munmap((void *)bufs[i], filesize);
     }
 err_fd:
-    for (i = 0; i < ARRAY_SIZE(fds) && fds[i] >= 0; i++) {
+    for (size_t i = 0; i < ARRAY_SIZE(fds) && fds[i] >= 0; i++) {
         close(fds[i]);
     }
     return ret;