summaryrefslogtreecommitdiffstats
path: root/util/cbfstool/cbfstool.c
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2022-03-04 17:49:56 -0800
committerJulius Werner <jwerner@chromium.org>2022-03-09 02:18:21 +0000
commit69cc557cfb6eb2cbb5b137bc206cd759c1dba5f0 (patch)
treeab51422700fa7f5257fb72cc72bf8330780f8e06 /util/cbfstool/cbfstool.c
parent270b0b60acba4802b8a9272d2727ee576733ad47 (diff)
downloadcoreboot-69cc557cfb6eb2cbb5b137bc206cd759c1dba5f0.tar.gz
coreboot-69cc557cfb6eb2cbb5b137bc206cd759c1dba5f0.tar.bz2
coreboot-69cc557cfb6eb2cbb5b137bc206cd759c1dba5f0.zip
commonlib/bsd: Remove cb_err_t
cb_err_t was meant to be used in place of `enum cb_err` in all situations, but the choice to use a typedef here seems to be controversial. We should not be arbitrarily using two different identifiers for the same thing across the codebase, so since there are no use cases for serializing enum cb_err at the moment (which would be the primary reason to typedef a fixed-width integer instead), remove cb_err_t again for now. Signed-off-by: Julius Werner <jwerner@chromium.org> Change-Id: Iaec36210d129db26d51f0a105d3de070c03b686b Reviewed-on: https://review.coreboot.org/c/coreboot/+/62600 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Yu-Ping Wu <yupingso@google.com> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Diffstat (limited to 'util/cbfstool/cbfstool.c')
-rw-r--r--util/cbfstool/cbfstool.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index b76534057a5e..cebfef6bb4a9 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -247,8 +247,8 @@ static int maybe_update_metadata_hash(struct cbfs_image *cbfs)
if (mhc->cbfs_hash.algo == VB2_HASH_INVALID)
return 0;
- cb_err_t err = cbfs_walk(cbfs, NULL, NULL, &mhc->cbfs_hash,
- CBFS_WALK_WRITEBACK_HASH);
+ enum cb_err err = cbfs_walk(cbfs, NULL, NULL, &mhc->cbfs_hash,
+ CBFS_WALK_WRITEBACK_HASH);
if (err != CB_CBFS_NOT_FOUND) {
ERROR("Unexpected cbfs_walk() error %d\n", err);
return -1;
@@ -1508,8 +1508,8 @@ static int cbfs_print(void)
return 0;
struct vb2_hash real_hash = { .algo = mhc->cbfs_hash.algo };
- cb_err_t err = cbfs_walk(&image, NULL, NULL, &real_hash,
- CBFS_WALK_WRITEBACK_HASH);
+ enum cb_err err = cbfs_walk(&image, NULL, NULL, &real_hash,
+ CBFS_WALK_WRITEBACK_HASH);
if (err != CB_CBFS_NOT_FOUND) {
ERROR("Unexpected cbfs_walk() error %d\n", err);
return 1;