summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-10-13 10:09:12 +0200
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-10-13 10:09:12 +0200
commit272eedf93d683c3065e621c85ecb809572c0eea4 (patch)
tree7dced004f2b82d467609891e2bbdccd5476fd92e /recovery.cpp
parentSnap for 4388640 from 6d5da419715a852e29dde9f25858dc3802819dea to pi-release (diff)
parentMerge "Fix owner email address." am: b4a8c6abd9 am: 97d9ae086a am: bb971cce89 (diff)
downloadandroid_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.tar
android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.tar.gz
android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.tar.bz2
android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.tar.lz
android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.tar.xz
android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.tar.zst
android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp21
1 files changed, 10 insertions, 11 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 243ee4af3..a89916337 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1214,9 +1214,8 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
}
}
-static void
-print_property(const char *key, const char *name, void *cookie) {
- printf("%s=%s\n", key, name);
+static void print_property(const char* key, const char* name, void* /* cookie */) {
+ printf("%s=%s\n", key, name);
}
static std::string load_locale_from_cache() {
@@ -1250,14 +1249,14 @@ void ui_print(const char* format, ...) {
static constexpr char log_characters[] = "VDIWEF";
-void UiLogger(android::base::LogId id, android::base::LogSeverity severity,
- const char* tag, const char* file, unsigned int line,
- const char* message) {
- if (severity >= android::base::ERROR && ui != nullptr) {
- ui->Print("E:%s\n", message);
- } else {
- fprintf(stdout, "%c:%s\n", log_characters[severity], message);
- }
+void UiLogger(android::base::LogId /* id */, android::base::LogSeverity severity,
+ const char* /* tag */, const char* /* file */, unsigned int /* line */,
+ const char* message) {
+ if (severity >= android::base::ERROR && ui != nullptr) {
+ ui->Print("E:%s\n", message);
+ } else {
+ fprintf(stdout, "%c:%s\n", log_characters[severity], message);
+ }
}
static bool is_battery_ok() {