diff mbox series

[v2,3/5] lib/efi: Fix build warnings

Message ID 6d24c7bf-b3fe-9b38-9cb5-48104ab43f47@infradead.org
State New
Headers show
Series None | expand

Commit Message

Geoff Levand May 3, 2020, 6:10 p.m. UTC 
Fixes build warnings like these when building as 32-bit:

  warning: format ‘%ld’ expects argument of type ‘long int’, but argument 4 has type ‘ssize_t’

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
V2: Use '%zd' in format strings.

 lib/efi/efivar.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/lib/efi/efivar.c b/lib/efi/efivar.c
index 37bb6d9..c33e02f 100644
--- a/lib/efi/efivar.c
+++ b/lib/efi/efivar.c
@@ -34,7 +34,7 @@ 
 #include "talloc/talloc.h"
 
 #ifndef EFIVARFS_MAGIC
-#define EFIVARFS_MAGIC 0xde5e81e4
+#define EFIVARFS_MAGIC 0xde5e81e4UL
 #endif
 
 void efi_init_mount(struct efi_mount *efi_mount, const char *path,
@@ -71,7 +71,7 @@  bool efi_check_mount_magic(const struct efi_mount *efi_mount, bool check_magic)
 		return false;
 	}
 
-	if (check_magic && s.f_type != EFIVARFS_MAGIC) {
+	if (check_magic && ((unsigned long)s.f_type != EFIVARFS_MAGIC)) {
 		pb_debug_fn("Bad magic = 0x%lx\n", (unsigned long)s.f_type);
 		return false;
 	}
@@ -182,12 +182,12 @@  int efi_get_variable(void *ctx, const struct efi_mount *efi_mount,
 			if (errno == EAGAIN || errno == EWOULDBLOCK)
 				continue;
 
-			pb_log("%s: read failed %s: (%ld) (%d) %s\n", __func__, path,
+			pb_log("%s: read failed %s: (%zd) (%d) %s\n", __func__, path,
 				count, errno, strerror(errno));
 			goto exit;
 		}
 		if (p >= (buf + sizeof(buf))) {
-			pb_log("%s: buffer full %s: (%ld)\n", __func__, path,
+			pb_log("%s: buffer full %s: (%zd)\n", __func__, path,
 				sizeof(buf));
 			goto exit;
 		}
@@ -241,7 +241,7 @@  int efi_set_variable(const struct efi_mount *efi_mount, const char *name,
 
 	count = write(fd, buf, bufsize);
 	if ((size_t)count != bufsize) {
-		pb_log("%s: write failed %s: (%ld) (%d) %s\n", __func__, name,
+		pb_log("%s: write failed %s: (%zd) (%d) %s\n", __func__, name,
 			count, errno, strerror(errno));
 		goto exit;
 	}