summaryrefslogtreecommitdiff
path: root/futility
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-06-27 12:53:48 +0800
committerCommit Bot <commit-bot@chromium.org>2019-07-15 00:49:17 +0000
commit103f81d91c64b13267b26fc99c7fe4221eeae63f (patch)
treea5bbd6a303bb08655215fc7d9b151588b51ff4df /futility
parentf37fe67b28da63485613f890b9ccb2a423855da8 (diff)
downloadvboot-103f81d91c64b13267b26fc99c7fe4221eeae63f.tar.gz
vboot: use Fatal instead of VbExError in cmd_vbutil_kernel
BUG=b:124141368 TEST=make clean && make runtests BRANCH=none Change-Id: Iff20dcc3aa47bfa29776609e5b352ea464c18241 Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1680189 Tested-by: Joel Kitching <kitching@chromium.org> Commit-Queue: Joel Kitching <kitching@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'futility')
-rw-r--r--futility/cmd_vbutil_kernel.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c
index a5bacdda..3adc1f4d 100644
--- a/futility/cmd_vbutil_kernel.c
+++ b/futility/cmd_vbutil_kernel.c
@@ -602,8 +602,7 @@ static int do_vbutil_kernel(int argc, char *argv[])
f = fopen(vmlinuz_out_file, "wb");
if (!f) {
- VbExError("Can't open output file %s\n",
- vmlinuz_out_file);
+ Fatal("Can't open output file %s\n", vmlinuz_out_file);
return 1;
}
@@ -620,9 +619,9 @@ static int do_vbutil_kernel(int argc, char *argv[])
kblob_size,
vmlinuz_header_address,
vmlinuz_header_size)) {
- VbExError("Vmlinuz header not signed!\n");
fclose(f);
unlink(vmlinuz_out_file);
+ Fatal("Vmlinuz header not signed!\n");
return 1;
}
// calculate the vmlinuz_header offset from
@@ -644,10 +643,9 @@ static int do_vbutil_kernel(int argc, char *argv[])
1,
f));
if (errcount) {
- VbExError("Can't write output file %s\n",
- vmlinuz_out_file);
fclose(f);
unlink(vmlinuz_out_file);
+ Fatal("Can't write output file %s\n", vmlinuz_out_file);
return 1;
}