Merge "Enable printf format argument checking."

adb_install.cpp

@@ -109,7 +109,7 @@ apply_from_adb(RecoveryUI* ui_, bool* wipe_cache, const char* install_file) {
                 sleep(1);
                 continue;
             } else {
-                ui->Print("\nTimed out waiting for package.\n\n", strerror(errno));
+                ui->Print("\nTimed out waiting for package.\n\n");
                 result = INSTALL_ERROR;
                 kill(child, SIGKILL);
                 break;

recovery.cpp

@@ -844,7 +844,7 @@ static int apply_from_sdcard(Device* device, bool* wipe_cache) {
 
     char* path = browse_directory(SDCARD_ROOT, device);
     if (path == NULL) {
-        ui->Print("\n-- No package file selected.\n", path);
+        ui->Print("\n-- No package file selected.\n");
         return INSTALL_ERROR;
     }
 

screen_ui.h

@@ -47,11 +47,11 @@ class ScreenRecoveryUI : public RecoveryUI {
     bool WasTextEverVisible();
 
     // printing messages
-    void Print(const char* fmt, ...); // __attribute__((format(printf, 1, 2)));
+    void Print(const char* fmt, ...) __printflike(2, 3);
 
     // menu display
     void StartMenu(const char* const * headers, const char* const * items,
-                           int initial_selection);
+                   int initial_selection);
     int SelectMenu(int sel);
     void EndMenu();
 

ui.h

@@ -63,7 +63,7 @@ class RecoveryUI {
 
     // Write a message to the on-screen log (shown if the user has
     // toggled on the text display).
-    virtual void Print(const char* fmt, ...) = 0; // __attribute__((format(printf, 1, 2))) = 0;
+    virtual void Print(const char* fmt, ...) __printflike(2, 3) = 0;
 
     // --- key handling ---