diff options
| author | Joel Kitching <kitching@google.com> | 2019-07-31 14:12:30 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-13 04:36:52 +0000 |
| commit | e6700f4c70fe72850ae4f3f5df19c9281ebcefc8 (patch) | |
| tree | 0f2abff7be99bc140e288058fb2eeab6f8bb8b64 /tests/vb2_api_tests.c | |
| parent | a5afd01feb0b4b45adbcd8ab38ab8a2ef2a2ef67 (diff) | |
| download | vboot-e6700f4c70fe72850ae4f3f5df19c9281ebcefc8.tar.gz | |
vboot: update vboot2 functions to use new vb2_error_t
To make explicit when vboot2 error codes should be returned,
use the new vb2_error_t type on all functions which return
VB2_ERROR_* constants.
BUG=b:124141368, chromium:988410
TEST=make clean && make runtests
BRANCH=none
Change-Id: Idd3ee8afe8c78347783ce5fa829cb78f1e5719e2
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:1728113, chromium:1728499
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1728292
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests/vb2_api_tests.c')
| -rw-r--r-- | tests/vb2_api_tests.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/vb2_api_tests.c b/tests/vb2_api_tests.c index 144102a6..b4db22b8 100644 --- a/tests/vb2_api_tests.c +++ b/tests/vb2_api_tests.c @@ -36,10 +36,10 @@ static const uint8_t mock_hwid_digest[VB2_GBB_HWID_DIGEST_SIZE] = { /* Mocked function data */ static int force_dev_mode; -static int retval_vb2_fw_parse_gbb; -static int retval_vb2_check_dev_switch; -static int retval_vb2_check_tpm_clear; -static int retval_vb2_select_fw_slot; +static vb2_error_t retval_vb2_fw_parse_gbb; +static vb2_error_t retval_vb2_check_dev_switch; +static vb2_error_t retval_vb2_check_tpm_clear; +static vb2_error_t retval_vb2_select_fw_slot; /* Type of test to reset for */ enum reset_type { @@ -78,24 +78,24 @@ struct vb2_gbb_header *vb2_get_gbb(struct vb2_context *c) return &gbb; } -int vb2_fw_parse_gbb(struct vb2_context *c) +vb2_error_t vb2_fw_parse_gbb(struct vb2_context *c) { return retval_vb2_fw_parse_gbb; } -int vb2_check_dev_switch(struct vb2_context *c) +vb2_error_t vb2_check_dev_switch(struct vb2_context *c) { if (force_dev_mode) sd->flags |= VB2_SD_FLAG_DEV_MODE_ENABLED; return retval_vb2_check_dev_switch; } -int vb2_check_tpm_clear(struct vb2_context *c) +vb2_error_t vb2_check_tpm_clear(struct vb2_context *c) { return retval_vb2_check_tpm_clear; } -int vb2_select_fw_slot(struct vb2_context *c) +vb2_error_t vb2_select_fw_slot(struct vb2_context *c) { return retval_vb2_select_fw_slot; } |