From 1d156b988244660739c56803c87576f0403569ac Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 2 May 2018 12:43:18 -0700 Subject: screen_ui: Drop the dependency on common.h. Remove the use of fopen_path() in screen_ui.cpp, as this is the only place that requires the dependency on common.h. The mounting work should be done by the caller. Also change the parameter in RecoveryUI::ShowFile() from const char* to const std::string&. Test: mmma -j bootable/recovery Test: Build and boot into recovery image on angler. Choose 'View recovery logs'. Change-Id: I8e63f14a8e2b12b856e5a92476e4226cd6ea39fb --- screen_ui.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'screen_ui.cpp') diff --git a/screen_ui.cpp b/screen_ui.cpp index aaeb18c7f..00ed45d3e 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -42,7 +42,6 @@ #include #include -#include "common.h" #include "device.h" #include "ui.h" @@ -951,10 +950,10 @@ void ScreenRecoveryUI::ShowFile(FILE* fp) { } } -void ScreenRecoveryUI::ShowFile(const char* filename) { - FILE* fp = fopen_path(filename, "re"); - if (fp == nullptr) { - Print(" Unable to open %s: %s\n", filename, strerror(errno)); +void ScreenRecoveryUI::ShowFile(const std::string& filename) { + std::unique_ptr fp(fopen(filename.c_str(), "re"), fclose); + if (!fp) { + Print(" Unable to open %s: %s\n", filename.c_str(), strerror(errno)); return; } @@ -966,8 +965,7 @@ void ScreenRecoveryUI::ShowFile(const char* filename) { text_ = file_viewer_text_; ClearText(); - ShowFile(fp); - fclose(fp); + ShowFile(fp.get()); text_ = old_text; text_col_ = old_text_col; -- cgit v1.2.3