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

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 169413a..20c6ca1 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -391,7 +391,7 @@
 }
 
 // How much of the temp log we have copied to the copy in cache.
-static long tmplog_offset = 0;
+static off_t tmplog_offset = 0;
 
 static void copy_log_file(const char* source, const char* destination, bool append) {
     FILE* dest_fp = fopen_path(destination, append ? "a" : "w");
@@ -401,7 +401,7 @@
         FILE* source_fp = fopen(source, "r");
         if (source_fp != nullptr) {
             if (append) {
-                fseek(source_fp, tmplog_offset, SEEK_SET);  // Since last write
+                fseeko(source_fp, tmplog_offset, SEEK_SET);  // Since last write
             }
             char buf[4096];
             size_t bytes;
@@ -409,7 +409,7 @@
                 fwrite(buf, 1, bytes, dest_fp);
             }
             if (append) {
-                tmplog_offset = ftell(source_fp);
+                tmplog_offset = ftello(source_fp);
             }
             check_and_fclose(source_fp, source);
         }
@@ -1213,7 +1213,7 @@
         if (!isdigit(number.data()[0])) {
             name += ".1";
         } else {
-            unsigned long long i = std::stoull(number);
+            auto i = std::stoull(number);
             name = sub + "." + std::to_string(i + 1);
         }
     }