Enable printf format argument checking.

The original attempt missed the fact that Print is a member function,
so the first argument is the implicit 'this'.

Change-Id: I963b668c5432804c767f0a2e3ef7dea5978a1218
This commit is contained in:
Elliott Hughes 2015-04-08 16:51:36 -07:00
parent 900c9a61de
commit 018ed31c51
4 changed files with 5 additions and 5 deletions

View file

@ -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;

View file

@ -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;
}

View file

@ -47,7 +47,7 @@ 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,

2
ui.h
View file

@ -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 ---