From 69cc557cfb6eb2cbb5b137bc206cd759c1dba5f0 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 4 Mar 2022 17:49:56 -0800 Subject: 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 Change-Id: Iaec36210d129db26d51f0a105d3de070c03b686b Reviewed-on: https://review.coreboot.org/c/coreboot/+/62600 Tested-by: build bot (Jenkins) Reviewed-by: Yu-Ping Wu Reviewed-by: Tim Wawrzynczak --- util/cbfstool/cbfstool.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'util/cbfstool') diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index b76534057a..cebfef6bb4 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; -- cgit v1.2.3