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

screen_ui.cpp

diff --git a/screen_ui.cpp b/screen_ui.cpp
index 522aa6b..1d33269 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -356,7 +356,7 @@
         // minimum of 20ms delay between frames
         double delay = interval - (end-start);
         if (delay < 0.02) delay = 0.02;
-        usleep((long)(delay * 1000000));
+        usleep(static_cast<useconds_t>(delay * 1000000));
     }
 }
 
@@ -572,8 +572,8 @@
 }
 
 void ScreenRecoveryUI::ShowFile(FILE* fp) {
-    std::vector<long> offsets;
-    offsets.push_back(ftell(fp));
+    std::vector<off_t> offsets;
+    offsets.push_back(ftello(fp));
     ClearText();
 
     struct stat sb;
@@ -583,7 +583,7 @@
     while (true) {
         if (show_prompt) {
             PrintOnScreenOnly("--(%d%% of %d bytes)--",
-                  static_cast<int>(100 * (double(ftell(fp)) / double(sb.st_size))),
+                  static_cast<int>(100 * (double(ftello(fp)) / double(sb.st_size))),
                   static_cast<int>(sb.st_size));
             Redraw();
             while (show_prompt) {
@@ -602,7 +602,7 @@
                     if (feof(fp)) {
                         return;
                     }
-                    offsets.push_back(ftell(fp));
+                    offsets.push_back(ftello(fp));
                 }
             }
             ClearText();