summaryrefslogtreecommitdiffstats
path: root/screen_ui.cpp
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2016-04-18 20:30:55 +0200
committerChih-Hung Hsieh <chh@google.com>2016-04-18 21:29:30 +0200
commit54a2747ef305c10d07d8db393125dbcbb461c428 (patch)
treead6f90bea569c5f01bbf9485e356dcdb035d79c5 /screen_ui.cpp
parentMerge "Fix IWYU errors." (diff)
downloadandroid_bootable_recovery-54a2747ef305c10d07d8db393125dbcbb461c428.tar
android_bootable_recovery-54a2747ef305c10d07d8db393125dbcbb461c428.tar.gz
android_bootable_recovery-54a2747ef305c10d07d8db393125dbcbb461c428.tar.bz2
android_bootable_recovery-54a2747ef305c10d07d8db393125dbcbb461c428.tar.lz
android_bootable_recovery-54a2747ef305c10d07d8db393125dbcbb461c428.tar.xz
android_bootable_recovery-54a2747ef305c10d07d8db393125dbcbb461c428.tar.zst
android_bootable_recovery-54a2747ef305c10d07d8db393125dbcbb461c428.zip
Diffstat (limited to 'screen_ui.cpp')
-rw-r--r--screen_ui.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp
index 522aa6b23..1d33269d2 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -356,7 +356,7 @@ void ScreenRecoveryUI::ProgressThreadLoop() {
// minimum of 20ms delay between frames
double delay = interval - (end-start);
if (delay < 0.02) delay = 0.02;
- usleep((long)(delay * 1000000));
+ usleep(static_cast<useconds_t>(delay * 1000000));
}
}
@@ -572,8 +572,8 @@ void ScreenRecoveryUI::ClearText() {
}
void ScreenRecoveryUI::ShowFile(FILE* fp) {
- std::vector<long> offsets;
- offsets.push_back(ftell(fp));
+ std::vector<off_t> offsets;
+ offsets.push_back(ftello(fp));
ClearText();
struct stat sb;
@@ -583,7 +583,7 @@ void ScreenRecoveryUI::ShowFile(FILE* fp) {
while (true) {
if (show_prompt) {
PrintOnScreenOnly("--(%d%% of %d bytes)--",
- static_cast<int>(100 * (double(ftell(fp)) / double(sb.st_size))),
+ static_cast<int>(100 * (double(ftello(fp)) / double(sb.st_size))),
static_cast<int>(sb.st_size));
Redraw();
while (show_prompt) {
@@ -602,7 +602,7 @@ void ScreenRecoveryUI::ShowFile(FILE* fp) {
if (feof(fp)) {
return;
}
- offsets.push_back(ftell(fp));
+ offsets.push_back(ftello(fp));
}
}
ClearText();