diff options
| author | Matthew Garrett <mjg@redhat.com> | 2012-11-01 09:46:51 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2012-11-01 09:46:51 -0400 |
| commit | ed711b02ec18fecbf8b627b563e8cdfe1253170a (patch) | |
| tree | 02a804391124880572855f839add0bfe022b7cdd | |
| parent | 5a8d573fb1349a6a1e7708b97934694d5ff735c4 (diff) | |
| download | efi-boot-shim-ed711b02ec18fecbf8b627b563e8cdfe1253170a.tar.gz efi-boot-shim-ed711b02ec18fecbf8b627b563e8cdfe1253170a.zip | |
Fix up some types
Type-checking the UEFI calls picked up a couple of problems. Fix them up.
| -rw-r--r-- | MokManager.c | 6 | ||||
| -rw-r--r-- | shim.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/MokManager.c b/MokManager.c index eb5bb919..5802d274 100644 --- a/MokManager.c +++ b/MokManager.c @@ -1362,7 +1362,7 @@ static INTN find_fs (void *data, void *data2, void *data3) { EFI_GUID fs_guid = SIMPLE_FILE_SYSTEM_PROTOCOL; UINTN count, i; UINTN OldSize, NewSize; - EFI_HANDLE **filesystem_handles; + EFI_HANDLE *filesystem_handles = NULL; struct menu_item *filesystems; BOOLEAN hash = !!data3; @@ -1383,7 +1383,7 @@ static INTN find_fs (void *data, void *data2, void *data3) { filesystems[0].colour = EFI_YELLOW; for (i=1; i<count; i++) { - EFI_HANDLE *fs = filesystem_handles[i-1]; + EFI_HANDLE fs = filesystem_handles[i-1]; EFI_FILE_IO_INTERFACE *fs_interface; EFI_DEVICE_PATH *path; EFI_FILE *root; @@ -1394,7 +1394,7 @@ static INTN find_fs (void *data, void *data2, void *data3) { EFI_GUID file_info_guid = EFI_FILE_INFO_ID; status = uefi_call_wrapper(BS->HandleProtocol, 3, fs, &fs_guid, - &fs_interface); + (void **)&fs_interface); if (status != EFI_SUCCESS || !fs_interface) continue; @@ -890,7 +890,8 @@ static EFI_STATUS load_image (EFI_LOADED_IMAGE *li, void **data, device = li->DeviceHandle; efi_status = uefi_call_wrapper(BS->HandleProtocol, 3, device, - &simple_file_system_protocol, &drive); + &simple_file_system_protocol, + (void **)&drive); if (efi_status != EFI_SUCCESS) { Print(L"Failed to find fs\n"); @@ -1011,7 +1012,7 @@ EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath) int datasize; efi_status = uefi_call_wrapper(BS->HandleProtocol, 3, image_handle, - &loaded_image_protocol, &li); + &loaded_image_protocol, (void **)&li); if (efi_status != EFI_SUCCESS) { Print(L"Unable to init protocol\n"); |