diff options
| author | Joel Kitching <kitching@google.com> | 2019-07-31 13:17:08 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-06 15:14:47 +0000 |
| commit | 90671fa6d2d3d48fab6408c7493be61bcee5868e (patch) | |
| tree | 73a740440899a86d87fcec45717fba23ea9c2838 /tests/vboot_api_kernel4_tests.c | |
| parent | 9c906110972f538ee5753845916ebd1f826f54b6 (diff) | |
| download | vboot-90671fa6d2d3d48fab6408c7493be61bcee5868e.tar.gz | |
vboot: rename VbError_t typedef to vb2_error_t
As part of the conversion of error codes from vboot1 to vboot2,
replace all instances of VbError_t with vb2_error_t.
vboot2 currently uses the int type for return values, but we
would like to implement the use of vb2_error_t instead, which is
potentially clearer than simply using an int. Existing functions
will be converted to use vb2_error_t in a subsequent CL.
BUG=b:124141368, chromium:988410
TEST=make clean && make runtests
BRANCH=none
Change-Id: Iee90d9a1f46bcf5f088e981ba6ddbcf886ff0f18
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:1728112
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1722914
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests/vboot_api_kernel4_tests.c')
| -rw-r--r-- | tests/vboot_api_kernel4_tests.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index d2f19fa9..e466baf9 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -38,7 +38,7 @@ static uint32_t rkr_version; static uint32_t new_version; static struct RollbackSpaceFwmp rfr_fwmp; static int rkr_retval, rkw_retval, rkl_retval, rfr_retval; -static VbError_t vbboot_retval; +static vb2_error_t vbboot_retval; static uint32_t mock_switches[8]; static uint32_t mock_switches_count; @@ -90,14 +90,14 @@ static void ResetMocks(void) /* Mock functions */ -VbError_t VbExNvStorageRead(uint8_t *buf) +vb2_error_t VbExNvStorageRead(uint8_t *buf) { memcpy(buf, ctx_nvram_backend.nvdata, vb2_nv_get_size(&ctx_nvram_backend)); return VBERROR_SUCCESS; } -VbError_t VbExNvStorageWrite(const uint8_t *buf) +vb2_error_t VbExNvStorageWrite(const uint8_t *buf) { memcpy(ctx_nvram_backend.nvdata, buf, vb2_nv_get_size(&ctx_nvram_backend)); @@ -137,7 +137,7 @@ uint32_t VbTryLoadKernel(struct vb2_context *c, uint32_t get_info_flags) return vbboot_retval; } -VbError_t VbBootDeveloper(struct vb2_context *c) +vb2_error_t VbBootDeveloper(struct vb2_context *c) { shared->kernel_version_tpm = new_version; @@ -147,7 +147,7 @@ VbError_t VbBootDeveloper(struct vb2_context *c) return vbboot_retval; } -VbError_t VbBootRecovery(struct vb2_context *c) +vb2_error_t VbBootRecovery(struct vb2_context *c) { shared->kernel_version_tpm = new_version; @@ -157,7 +157,7 @@ VbError_t VbBootRecovery(struct vb2_context *c) return vbboot_retval; } -VbError_t VbBootDiagnostic(struct vb2_context *c) +vb2_error_t VbBootDiagnostic(struct vb2_context *c) { if (vbboot_retval == -4) return VBERROR_SIMULATED; @@ -165,7 +165,7 @@ VbError_t VbBootDiagnostic(struct vb2_context *c) return vbboot_retval; } -static void test_slk(VbError_t retval, int recovery_reason, const char *desc) +static void test_slk(vb2_error_t retval, int recovery_reason, const char *desc) { TEST_EQ(VbSelectAndLoadKernel(&ctx, shared, &kparams), retval, desc); TEST_EQ(vb2_nv_get(&ctx_nvram_backend, VB2_NV_RECOVERY_REQUEST), |