summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-09 02:22:36 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-09 02:22:36 +0200
commitfbde407e4c72965aae4ea6dff7493e30af307ca5 (patch)
tree1d6cd4cb955dc89e313a6b3f894a10af4d833504
parentMerge "Remove the fixed screen size assumptions." (diff)
parentEnable printf format argument checking. (diff)
downloadandroid_bootable_recovery-fbde407e4c72965aae4ea6dff7493e30af307ca5.tar
android_bootable_recovery-fbde407e4c72965aae4ea6dff7493e30af307ca5.tar.gz
android_bootable_recovery-fbde407e4c72965aae4ea6dff7493e30af307ca5.tar.bz2
android_bootable_recovery-fbde407e4c72965aae4ea6dff7493e30af307ca5.tar.lz
android_bootable_recovery-fbde407e4c72965aae4ea6dff7493e30af307ca5.tar.xz
android_bootable_recovery-fbde407e4c72965aae4ea6dff7493e30af307ca5.tar.zst
android_bootable_recovery-fbde407e4c72965aae4ea6dff7493e30af307ca5.zip
Diffstat (limited to '')
-rw-r--r--adb_install.cpp2
-rw-r--r--recovery.cpp2
-rw-r--r--screen_ui.h4
-rw-r--r--ui.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/adb_install.cpp b/adb_install.cpp
index ed15938e2..9e605e2d5 100644
--- a/adb_install.cpp
+++ b/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;
diff --git a/recovery.cpp b/recovery.cpp
index 2f8654a84..1726a227e 100644
--- a/recovery.cpp
+++ b/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;
}
diff --git a/screen_ui.h b/screen_ui.h
index 210fd3e17..82647ac75 100644
--- a/screen_ui.h
+++ b/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();
diff --git a/ui.h b/ui.h
index 31a8a7fb1..a0580b703 100644
--- a/ui.h
+++ b/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 ---