summaryrefslogtreecommitdiffstats
path: root/ui.cpp
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2011-10-28 19:33:05 +0200
committerDoug Zongker <dougz@android.com>2011-10-31 18:24:09 +0100
commit28ce47cfa6919518a8c298088bf08b03bb374c0f (patch)
tree0c429bcc8f4a1935f3be97d87ebdc2f4434ee887 /ui.cpp
parentallow recovery packages to wipe cache (diff)
downloadandroid_bootable_recovery-28ce47cfa6919518a8c298088bf08b03bb374c0f.tar
android_bootable_recovery-28ce47cfa6919518a8c298088bf08b03bb374c0f.tar.gz
android_bootable_recovery-28ce47cfa6919518a8c298088bf08b03bb374c0f.tar.bz2
android_bootable_recovery-28ce47cfa6919518a8c298088bf08b03bb374c0f.tar.lz
android_bootable_recovery-28ce47cfa6919518a8c298088bf08b03bb374c0f.tar.xz
android_bootable_recovery-28ce47cfa6919518a8c298088bf08b03bb374c0f.tar.zst
android_bootable_recovery-28ce47cfa6919518a8c298088bf08b03bb374c0f.zip
Diffstat (limited to '')
-rw-r--r--ui.cpp (renamed from ui.c)12
1 files changed, 7 insertions, 5 deletions
diff --git a/ui.c b/ui.cpp
index 25df3d043..657a01ece 100644
--- a/ui.c
+++ b/ui.cpp
@@ -32,6 +32,7 @@
#include <cutils/android_reboot.h>
#include "minui/minui.h"
#include "recovery_ui.h"
+#include "ui.h"
#define MAX_COLS 96
#define MAX_ROWS 32
@@ -397,8 +398,8 @@ void ui_init(void)
}
}
- gProgressBarIndeterminate = malloc(ui_parameters.indeterminate_frames *
- sizeof(gr_surface));
+ gProgressBarIndeterminate = (gr_surface*)malloc(ui_parameters.indeterminate_frames *
+ sizeof(gr_surface));
for (i = 0; i < ui_parameters.indeterminate_frames; ++i) {
char filename[40];
// "indeterminate01.png", "indeterminate02.png", ...
@@ -410,8 +411,8 @@ void ui_init(void)
}
if (ui_parameters.installing_frames > 0) {
- gInstallationOverlay = malloc(ui_parameters.installing_frames *
- sizeof(gr_surface));
+ gInstallationOverlay = (gr_surface*)malloc(ui_parameters.installing_frames *
+ sizeof(gr_surface));
for (i = 0; i < ui_parameters.installing_frames; ++i) {
char filename[40];
// "icon_installing_overlay01.png",
@@ -529,7 +530,8 @@ void ui_print(const char *fmt, ...)
pthread_mutex_unlock(&gUpdateMutex);
}
-void ui_start_menu(char** headers, char** items, int initial_selection) {
+void ui_start_menu(const char* const * headers, const char* const * items,
+ int initial_selection) {
int i;
pthread_mutex_lock(&gUpdateMutex);
if (text_rows > 0 && text_cols > 0) {