summaryrefslogtreecommitdiff
path: root/debian/patches/fix-compiler-warnings
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/fix-compiler-warnings')
-rw-r--r--debian/patches/fix-compiler-warnings49
1 files changed, 49 insertions, 0 deletions
diff --git a/debian/patches/fix-compiler-warnings b/debian/patches/fix-compiler-warnings
new file mode 100644
index 00000000..b90c9f2a
--- /dev/null
+++ b/debian/patches/fix-compiler-warnings
@@ -0,0 +1,49 @@
+Description: Fix remaining compiler warnings in netboot.c
+ Fix remaining compiler warnings in netboot.c, so that the source builds
+ cleanly under -Wall -Werror.
+Author: Steve Langasek <steve.langasek@ubuntu.com>
+
+=== modified file 'netboot.c'
+Index: shim/netboot.c
+===================================================================
+--- shim.orig/netboot.c
++++ shim/netboot.c
+@@ -53,7 +53,7 @@
+
+ static EFI_PXE_BASE_CODE *pxe;
+ static EFI_IP_ADDRESS tftp_addr;
+-static char *full_path;
++static UINT8 *full_path;
+
+
+ typedef struct {
+@@ -111,7 +111,7 @@
+ for (i=0; i < (bs / sizeof(EFI_HANDLE)); i++) {
+ status = uefi_call_wrapper(BS->OpenProtocol, 6, hbuf[i],
+ &pxe_base_code_protocol,
+- &pxe, image_handle, NULL,
++ (void **)&pxe, image_handle, NULL,
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL);
+
+ if (status != EFI_SUCCESS) {
+@@ -261,9 +261,9 @@
+ return FALSE;
+ memset(full_path, 0, strlen((UINT8 *)end)+strlen((UINT8 *)template));
+ memcpy(full_path, end, strlen((UINT8 *)end));
+- end = strrchr(full_path, '/');
++ end = strrchr((char *)full_path, '/');
+ if (!end)
+- end = full_path;
++ end = (char *)full_path;
+ memcpy(end, template, strlen((UINT8 *)template));
+
+ return TRUE;
+@@ -297,7 +297,7 @@
+
+ memcpy(tmp, template, 12);
+ tmp[13] = '\0';
+- full_path = tmp;
++ full_path = (UINT8 *)tmp;
+
+ /* Note we don't capture the filename option here because we know its shim.efi
+ * We instead assume the filename at the end of the path is going to be grubx64.efi