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_kernel2_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_kernel2_tests.c')
| -rw-r--r-- | tests/vboot_api_kernel2_tests.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c index c8e269e0..f37913c4 100644 --- a/tests/vboot_api_kernel2_tests.c +++ b/tests/vboot_api_kernel2_tests.c @@ -199,8 +199,8 @@ uint64_t VbExGetTimer(void) return current_ticks; } -VbError_t VbExDiskGetInfo(VbDiskInfo **infos_ptr, uint32_t *count, - uint32_t disk_flags) +vb2_error_t VbExDiskGetInfo(VbDiskInfo **infos_ptr, uint32_t *count, + uint32_t disk_flags) { if (mock_num_disks_count < ARRAY_SIZE(mock_num_disks)) { if (mock_num_disks[mock_num_disks_count] == -1) @@ -213,8 +213,8 @@ VbError_t VbExDiskGetInfo(VbDiskInfo **infos_ptr, uint32_t *count, return VBERROR_SUCCESS; } -VbError_t VbExDiskFreeInfo(VbDiskInfo *infos, - VbExDiskHandle_t preserve_handle) +vb2_error_t VbExDiskFreeInfo(VbDiskInfo *infos, + VbExDiskHandle_t preserve_handle) { return VBERROR_SUCCESS; } @@ -239,8 +239,8 @@ uint32_t VbTryLoadKernel(struct vb2_context *c, uint32_t get_info_flags) return vbtlk_retval + get_info_flags; } -VbError_t VbDisplayScreen(struct vb2_context *c, uint32_t screen, int force, - const VbScreenData *data) +vb2_error_t VbDisplayScreen(struct vb2_context *c, uint32_t screen, int force, + const VbScreenData *data) { if (screens_count < ARRAY_SIZE(screens_displayed)) screens_displayed[screens_count++] = screen; @@ -254,7 +254,7 @@ uint32_t SetVirtualDevMode(int val) return virtdev_retval; } -VbError_t VbExSetVendorData(const char *vendor_data_value) +vb2_error_t VbExSetVendorData(const char *vendor_data_value) { set_vendor_data_called = 1; strncpy(set_vendor_data, vendor_data_value, sizeof(set_vendor_data)); |