diff options
| author | Joel Kitching <kitching@google.com> | 2019-06-28 14:53:57 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-07-22 09:13:52 +0000 |
| commit | 772908aef95bf21d139a06c45c674241da9af6ac (patch) | |
| tree | d32ab63b53062636af662950f960071d1dcb0415 /futility/cmd_sign.c | |
| parent | a529598bd4efc3355952e609fed17b504a738ea7 (diff) | |
| download | vboot-772908aef95bf21d139a06c45c674241da9af6ac.tar.gz | |
vboot/futility: update fatal errors to use FATAL
Previously, a mix of:
- DIE
- Fatal (customly defined in cmd_vbutil_kernel.c)
- VbExError
... were all used to print an error message and exit.
In the case of futility, standardize on using the FATAL macro
defined in futility.h.
BUG=b:124141368
TEST=Check that FATAL works correctly:
$ build/futility/futility vbutil_key --in a --out a --algorithm 18
FATAL: do_vbutil_key: Unknown option
TEST=make clean && make runtests
BRANCH=none
Change-Id: I97ca1153dc36e7208c69185883518c52d5d75293
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1679799
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'futility/cmd_sign.c')
| -rw-r--r-- | futility/cmd_sign.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/futility/cmd_sign.c b/futility/cmd_sign.c index 4d0c262f..d6ce4e08 100644 --- a/futility/cmd_sign.c +++ b/futility/cmd_sign.c @@ -143,7 +143,7 @@ int ft_sign_raw_kernel(const char *name, uint8_t *buf, uint32_t len, /* We should be creating a completely new output file. * If not, something's wrong. */ if (!sign_option.create_new_outfile) - DIE; + FATAL("create_new_outfile should be selected\n"); if (sign_option.vblockonly) rv = WriteSomeParts(sign_option.outfile, @@ -862,8 +862,7 @@ static int do_sign(int argc, char *argv[]) case 0: /* handled option */ break; default: - VB2_DEBUG("i=%d\n", i); - DIE; + FATAL("Unrecognized getopt output: %d\n", i); } } |