summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-03-30 08:57:47 +0200
committerTao Bao <tbao@google.com>2017-03-30 19:28:37 +0200
commit0bbc764bbe8fc04eba1bf708fbf97526950cbeef (patch)
tree8ea63632e1825e4d99b224929e8e6b4e2353722d
parentMerge "Add test config to minadbd_test" (diff)
downloadandroid_bootable_recovery-0bbc764bbe8fc04eba1bf708fbf97526950cbeef.tar
android_bootable_recovery-0bbc764bbe8fc04eba1bf708fbf97526950cbeef.tar.gz
android_bootable_recovery-0bbc764bbe8fc04eba1bf708fbf97526950cbeef.tar.bz2
android_bootable_recovery-0bbc764bbe8fc04eba1bf708fbf97526950cbeef.tar.lz
android_bootable_recovery-0bbc764bbe8fc04eba1bf708fbf97526950cbeef.tar.xz
android_bootable_recovery-0bbc764bbe8fc04eba1bf708fbf97526950cbeef.tar.zst
android_bootable_recovery-0bbc764bbe8fc04eba1bf708fbf97526950cbeef.zip
Diffstat (limited to '')
-rw-r--r--updater/blockimg.cpp3
-rw-r--r--updater/install.cpp16
2 files changed, 10 insertions, 9 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 8c0f885a1..4409cbefe 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -18,6 +18,7 @@
#include <errno.h>
#include <dirent.h>
#include <fcntl.h>
+#include <inttypes.h>
#include <linux/fs.h>
#include <pthread.h>
#include <stdarg.h>
@@ -1831,7 +1832,7 @@ Value* CheckFirstBlockFn(const char* name, State* state,
uint16_t mount_count = *reinterpret_cast<uint16_t*>(&block0_buffer[0x400+0x34]);
if (mount_count > 0) {
- uiPrintf(state, "Device was remounted R/W %d times\n", mount_count);
+ uiPrintf(state, "Device was remounted R/W %" PRIu16 " times", mount_count);
uiPrintf(state, "Last remount happened on %s", ctime(&mount_time));
}
diff --git a/updater/install.cpp b/updater/install.cpp
index f91f3fc9f..857d7f1e0 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -181,8 +181,8 @@ Value* MountFn(const char* name, State* state, const std::vector<std::unique_ptr
if (mount(location.c_str(), mount_point.c_str(), fs_type.c_str(),
MS_NOATIME | MS_NODEV | MS_NODIRATIME, mount_options.c_str()) < 0) {
- uiPrintf(state, "%s: failed to mount %s at %s: %s\n", name, location.c_str(),
- mount_point.c_str(), strerror(errno));
+ uiPrintf(state, "%s: Failed to mount %s at %s: %s", name, location.c_str(), mount_point.c_str(),
+ strerror(errno));
return StringValue("");
}
@@ -231,12 +231,12 @@ Value* UnmountFn(const char* name, State* state, const std::vector<std::unique_p
scan_mounted_volumes();
MountedVolume* vol = find_mounted_volume_by_mount_point(mount_point.c_str());
if (vol == nullptr) {
- uiPrintf(state, "unmount of %s failed; no such volume\n", mount_point.c_str());
+ uiPrintf(state, "Failed to unmount %s: No such volume", mount_point.c_str());
return nullptr;
} else {
int ret = unmount_mounted_volume(vol);
if (ret != 0) {
- uiPrintf(state, "unmount of %s failed (%d): %s\n", mount_point.c_str(), ret, strerror(errno));
+ uiPrintf(state, "Failed to unmount %s: %s", mount_point.c_str(), strerror(errno));
}
}
@@ -699,15 +699,15 @@ Value* ApplyPatchCheckFn(const char* name, State* state, const std::vector<std::
return StringValue(result == 0 ? "t" : "");
}
-// This is the updater side handler for ui_print() in edify script. Contents
-// will be sent over to the recovery side for on-screen display.
+// This is the updater side handler for ui_print() in edify script. Contents will be sent over to
+// the recovery side for on-screen display.
Value* UIPrintFn(const char* name, State* state, const std::vector<std::unique_ptr<Expr>>& argv) {
std::vector<std::string> args;
if (!ReadArgs(state, argv, &args)) {
- return ErrorAbort(state, kArgsParsingFailure, "%s() Failed to parse the argument(s)", name);
+ return ErrorAbort(state, kArgsParsingFailure, "%s(): Failed to parse the argument(s)", name);
}
- std::string buffer = android::base::Join(args, "") + "\n";
+ std::string buffer = android::base::Join(args, "");
uiPrint(state, buffer);
return StringValue(buffer);
}