commit 54a2747ef305c10d07d8db393125dbcbb461c428
author Chih-Hung Hsieh <chh@google.com> Mon Apr 18 11:30:55 2016 -0700
committer Chih-Hung Hsieh <chh@google.com> Mon Apr 18 12:29:30 2016 -0700
tree ad6f90bea569c5f01bbf9485e356dcdb035d79c5
parent 51dcd0da37dd10238017bae03fc708dc6e05bb56

Fix google-runtime-int warnings.

Bug: 28220065
Change-Id: Ida199c66692a1638be6990d583d2ed42583fb592

updater/install.cpp

diff --git a/updater/install.cpp b/updater/install.cpp
index 925604f..4f52684 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -602,8 +602,8 @@
         v->size = mzGetZipEntryUncompLen(entry);
         v->data = reinterpret_cast<char*>(malloc(v->size));
         if (v->data == NULL) {
-            printf("%s: failed to allocate %ld bytes for %s\n",
-                    name, (long)v->size, zip_path);
+            printf("%s: failed to allocate %zd bytes for %s\n",
+                    name, v->size, zip_path);
             goto done1;
         }
 
@@ -992,7 +992,8 @@
 
     buffer = reinterpret_cast<char*>(malloc(st.st_size+1));
     if (buffer == NULL) {
-        ErrorAbort(state, "%s: failed to alloc %lld bytes", name, (long long)st.st_size+1);
+        ErrorAbort(state, "%s: failed to alloc %zu bytes", name,
+                   static_cast<size_t>(st.st_size+1));
         goto done;
     }
 
@@ -1004,8 +1005,8 @@
     }
 
     if (ota_fread(buffer, 1, st.st_size, f) != static_cast<size_t>(st.st_size)) {
-        ErrorAbort(state, "%s: failed to read %lld bytes from %s",
-                   name, (long long)st.st_size+1, filename);
+        ErrorAbort(state, "%s: failed to read %zu bytes from %s",
+                   name, static_cast<size_t>(st.st_size), filename);
         ota_fclose(f);
         goto done;
     }