diff options
| author | Tao Bao <tbao@google.com> | 2016-12-13 01:24:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-13 01:24:04 +0000 |
| commit | c908f4f0e33ab84e9be6ce40c58c9a9061fd359e (patch) | |
| tree | 5d236f4bbe28d90a9876435b957facef6a1b986b /bootloader_message | |
| parent | 594dc4f5be6effa97f1a2b87879790f1f7e65970 (diff) | |
| parent | 26d5ae741efd904fdc20187eddad33ca31dd64fa (diff) | |
Merge "Revert "write_bootloader_message(<options>) should not reset stage field.""
Diffstat (limited to 'bootloader_message')
| -rw-r--r-- | bootloader_message/bootloader_message.cpp | 8 | ||||
| -rw-r--r-- | bootloader_message/include/bootloader_message/bootloader_message.h | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp index 294b1725..9a567184 100644 --- a/bootloader_message/bootloader_message.cpp +++ b/bootloader_message/bootloader_message.cpp @@ -164,13 +164,7 @@ bool clear_bootloader_message(std::string* err) { } bool write_bootloader_message(const std::vector<std::string>& options, std::string* err) { - bootloader_message boot; - if (!read_bootloader_message(&boot, err)) { - return false; - } - // Zero out the entire fields. - memset(boot.command, 0, sizeof(boot.command)); - memset(boot.recovery, 0, sizeof(boot.recovery)); + bootloader_message boot = {}; strlcpy(boot.command, "boot-recovery", sizeof(boot.command)); strlcpy(boot.recovery, "recovery\n", sizeof(boot.recovery)); for (const auto& s : options) { diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h index 437189e3..b3d2182d 100644 --- a/bootloader_message/include/bootloader_message/bootloader_message.h +++ b/bootloader_message/include/bootloader_message/bootloader_message.h @@ -193,8 +193,7 @@ bool write_bootloader_message(const bootloader_message& boot, std::string* err); bool write_bootloader_message_to(const bootloader_message& boot, const std::string& misc_blk_device, std::string* err); -// Write bootloader message (boots into recovery with the options) to BCB. Will -// set command and recovery fields only. +// Write bootloader message (boots into recovery with the options) to BCB. bool write_bootloader_message(const std::vector<std::string>& options, std::string* err); // Clear BCB. |