diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2019-05-23 02:48:38 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-23 02:14:56 -0700 |
| commit | 70f795f497da5b80f9b9891998759243021b17bd (patch) | |
| tree | cd869532ec44816aa6c9c9baa3f8083223b768f4 | |
| parent | b3c40c0f3781aa10829636e5bc314a3e489bfa98 (diff) | |
| download | vboot-stabilize-12222.B.tar.gz | |
futility: updater: Fix logging messagesstabilize-12222.B
In CL:1601678, few logging messages were not properly converted:
- STATUS should add \n
- INFO and WARN should not need __FUNCTION__
BUG=None
TEST=make futil; tests/futility/run_test_scripts.sh $(pwd)/build/futility
BRANCH=None
Change-Id: Ib01d9319815a5fbb579e49391fc4bff9d61ca214
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1626189
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | futility/cmd_update.c | 2 | ||||
| -rw-r--r-- | futility/updater.c | 7 | ||||
| -rw-r--r-- | futility/updater_quirks.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/futility/cmd_update.c b/futility/cmd_update.c index 2c7d58c0..d64ed13a 100644 --- a/futility/cmd_update.c +++ b/futility/cmd_update.c @@ -242,7 +242,7 @@ static int do_update(int argc, char *argv[]) errorcnt += updater_setup_config(cfg, &args, &do_update); if (!errorcnt && do_update) { int r; - STATUS("Starting firmware updater."); + STATUS("Starting firmware updater.\n"); r = update_firmware(cfg); if (r != UPDATE_ERR_DONE) { r = Min(r, UPDATE_ERR_UNKNOWN); diff --git a/futility/updater.c b/futility/updater.c index 859dedee..a239a31c 100644 --- a/futility/updater.c +++ b/futility/updater.c @@ -849,8 +849,7 @@ static int write_firmware(struct updater_config *cfg, return -1; if (cfg->emulation) { - INFO("%s: (emulation) Writing %s from %s to %s (emu=%s).\n", - __FUNCTION__, + INFO("(emulation) Writing %s from %s to %s (emu=%s).\n", section_name ? section_name : "whole image", image->file_name, programmer, cfg->emulation); @@ -936,8 +935,8 @@ int preserve_firmware_section(const struct firmware_image *image_from, return -1; } if (from.size > to.size) { - WARN("%s: Section %.*s is truncated after updated.\n", - __FUNCTION__, FMAP_NAMELEN, section_name); + WARN("Section %.*s is truncated after updated.\n", + FMAP_NAMELEN, section_name); } /* Use memmove in case if we need to deal with sections that overlap. */ memmove(to.data, from.data, Min(from.size, to.size)); diff --git a/futility/updater_quirks.c b/futility/updater_quirks.c index 034a224b..42c411a8 100644 --- a/futility/updater_quirks.c +++ b/futility/updater_quirks.c @@ -135,7 +135,7 @@ static int quirk_unlock_me_for_update(struct updater_config *cfg) * b/35568719: We should only update with unlocked ME and let * board-postinst lock it. */ - INFO("%s: Changed Flash Master Values to unlocked.\n", __FUNCTION__); + INFO("Changed Flash Master Values to unlocked.\n"); memcpy(section.data + flash_master_offset, flash_master, ARRAY_SIZE(flash_master)); return 0; @@ -193,7 +193,7 @@ static int quirk_daisy_snow_dual_model(struct updater_config *cfg) if (strcmp(x16_versions[i], platform_version) == 0) is_x16 = 1; } - INFO("%s: Platform version: %s (original value: %s)\n", __FUNCTION__, + INFO("Platform version: %s (original value: %s)\n", is_x8 ? "x8" : is_x16 ? "x16": "unknown", platform_version); free(platform_version); |