commit a742fb0994454b7e80ca2867b170cf2c6096abc7
author Tao Bao <tbao@google.com> Thu Apr 26 15:26:25 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 26 15:26:25 2018 -0700
tree 670da6cc146ce288b595aff82ff74920482f33f8
parent 9882160d8dfa9add6aeed6ccde8602320407e550
parent 220b531e3d6caf328eb628ded75987f8055dd942

Merge "Mark ui_print with __printflike."
am: 220b531e3d

Change-Id: Ia13734618844f2ca82f83da897823183d8c9e443

common.h

diff --git a/common.h b/common.h
index a851306..4228e71 100644
--- a/common.h
+++ b/common.h
@@ -40,7 +40,7 @@
 // fopen a file, mounting volumes and making parent dirs as necessary.
 FILE* fopen_path(const std::string& path, const char* mode);
 
-void ui_print(const char* format, ...);
+void ui_print(const char* format, ...) __printflike(1, 2);
 
 bool is_ro_debuggable();
 

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index dbbac7a..7c83744 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1296,7 +1296,7 @@
                         charge_status != android::BATTERY_STATUS_NOT_CHARGING);
         android::BatteryProperty capacity;
         android::status_t status = monitor.getProperty(android::BATTERY_PROP_CAPACITY, &capacity);
-        ui_print("charge_status %d, charged %d, status %d, capacity %lld\n", charge_status,
+        ui_print("charge_status %d, charged %d, status %d, capacity %" PRId64 "\n", charge_status,
                  charged, status, capacity.valueInt64);
         // At startup, the battery drivers in devices like N5X/N6P take some time to load
         // the battery profile. Before the load finishes, it reports value 50 as a fake