diff options
| author | Peter Jones <pjones@redhat.com> | 2013-10-01 14:35:18 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2013-10-01 14:38:09 -0400 |
| commit | 6e5d86e5659d80b773932cf623c1a6972c06f11c (patch) | |
| tree | 3fdb43763b82d4e207e366cca7bbbbf42d773b04 | |
| parent | f330528786fb02f1771c76818ffc8f1793f5d2f7 (diff) | |
| download | efi-boot-shim-6e5d86e5659d80b773932cf623c1a6972c06f11c.tar.gz efi-boot-shim-6e5d86e5659d80b773932cf623c1a6972c06f11c.zip | |
Clean up warnings.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | lib/Makefile | 4 | ||||
| -rw-r--r-- | lib/execute.c | 2 | ||||
| -rw-r--r-- | lib/simple_file.c | 9 |
3 files changed, 9 insertions, 6 deletions
diff --git a/lib/Makefile b/lib/Makefile index c1b9ab34..adb03477 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -11,7 +11,9 @@ EFI_CRT_OBJS = $(EFI_PATH)/crt0-efi-$(ARCH).o EFI_LDS = $(EFI_PATH)/elf_$(ARCH)_efi.lds CFLAGS = -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \ - -fshort-wchar -Wall -mno-red-zone -DBUILD_EFI $(EFI_INCLUDES) + -fshort-wchar -Wall -mno-red-zone -DBUILD_EFI -fno-builtin \ + -Werror \ + $(EFI_INCLUDES) ifeq ($(ARCH),x86_64) CFLAGS += -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI endif diff --git a/lib/execute.c b/lib/execute.c index 8d726eb8..42d71c87 100644 --- a/lib/execute.c +++ b/lib/execute.c @@ -103,7 +103,7 @@ execute(EFI_HANDLE image, CHAR16 *name) CHAR16 *PathName; status = uefi_call_wrapper(BS->HandleProtocol, 3, image, - &IMAGE_PROTOCOL, &li); + &IMAGE_PROTOCOL, (void **)&li); if (status != EFI_SUCCESS) return status; diff --git a/lib/simple_file.c b/lib/simple_file.c index e2882728..3af0ec8d 100644 --- a/lib/simple_file.c +++ b/lib/simple_file.c @@ -25,7 +25,7 @@ simple_file_open_by_handle(EFI_HANDLE device, CHAR16 *name, EFI_FILE **file, UIN EFI_FILE *root; efi_status = uefi_call_wrapper(BS->HandleProtocol, 3, device, - &SIMPLE_FS_PROTOCOL, &drive); + &SIMPLE_FS_PROTOCOL, (void **)&drive); if (efi_status != EFI_SUCCESS) { Print(L"Unable to find simple file protocol (%d)\n", efi_status); @@ -56,7 +56,7 @@ simple_file_open(EFI_HANDLE image, CHAR16 *name, EFI_FILE **file, UINT64 mode) CHAR16 *PathName = NULL; efi_status = uefi_call_wrapper(BS->HandleProtocol, 3, image, - &IMAGE_PROTOCOL, &li); + &IMAGE_PROTOCOL, (void **)&li); if (efi_status != EFI_SUCCESS) return simple_file_open_by_handle(image, name, file, mode); @@ -116,7 +116,7 @@ simple_dir_read_all_by_handle(EFI_HANDLE image, EFI_FILE *file, CHAR16* name, EF return EFI_OUT_OF_RESOURCES; int i; for (i = 0; i < *count; i++) { - int len = size; + UINTN len = size; uefi_call_wrapper(file->Read, 3, file, &len, ptr); ptr += len; size -= len; @@ -223,7 +223,8 @@ simple_volume_selector(CHAR16 **title, CHAR16 **selected, EFI_HANDLE *h) status = uefi_call_wrapper(BS->HandleProtocol, 3, vol_handles[i], - &SIMPLE_FS_PROTOCOL, &drive); + &SIMPLE_FS_PROTOCOL, + (void **)&drive); if (status != EFI_SUCCESS || !drive) continue; |