From b59e0cc56eb6d5f3b6f934722931f6919309ffd2 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Tue, 18 Nov 2008 18:22:56 -0800
Subject: [i386] Change [u]int32_t to [unsigned] int, rather than [unsigned]
 long

This brings us in to line with Linux definitions, and also simplifies
adding x86_64 support since both platforms have 2-byte shorts, 4-byte
ints and 8-byte long longs.
---
 src/image/efi_image.c | 6 +++---
 src/image/elf.c       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/image')

diff --git a/src/image/efi_image.c b/src/image/efi_image.c
index c80cd264f..5992b622c 100644
--- a/src/image/efi_image.c
+++ b/src/image/efi_image.c
@@ -43,7 +43,7 @@ static int efi_image_exec ( struct image *image ) {
 				       user_to_virt ( image->data, 0 ),
 				       image->len, &handle ) ) != 0 ) {
 		/* Not an EFI image */
-		DBGC ( image, "EFIIMAGE %p could not load: %lx\n",
+		DBGC ( image, "EFIIMAGE %p could not load: %x\n",
 		       image, efirc );
 		return -ENOEXEC;
 	}
@@ -51,7 +51,7 @@ static int efi_image_exec ( struct image *image ) {
 	/* Start the image */
 	if ( ( efirc = bs->StartImage ( handle, &exit_data_size,
 					&exit_data ) ) != 0 ) {
-		DBGC ( image, "EFIIMAGE %p returned with status %lx\n",
+		DBGC ( image, "EFIIMAGE %p returned with status %x\n",
 		       image, efirc );
 		goto done;
 	}
@@ -81,7 +81,7 @@ static int efi_image_load ( struct image *image ) {
 				       user_to_virt ( image->data, 0 ),
 				       image->len, &handle ) ) != 0 ) {
 		/* Not an EFI image */
-		DBGC ( image, "EFIIMAGE %p could not load: %lx\n",
+		DBGC ( image, "EFIIMAGE %p could not load: %x\n",
 		       image, efirc );
 		return -ENOEXEC;
 	}
diff --git a/src/image/elf.c b/src/image/elf.c
index b932ff586..cb2b0f5bd 100644
--- a/src/image/elf.c
+++ b/src/image/elf.c
@@ -72,7 +72,7 @@ static int elf_load_segment ( struct image *image, Elf_Phdr *phdr ) {
 	}
 	buffer = phys_to_user ( dest );
 
-	DBG ( "ELF loading segment [%lx,%lx) to [%lx,%lx,%lx)\n",
+	DBG ( "ELF loading segment [%x,%x) to [%x,%x,%x)\n",
 	      phdr->p_offset, ( phdr->p_offset + phdr->p_filesz ),
 	      phdr->p_paddr, ( phdr->p_paddr + phdr->p_filesz ),
 	      ( phdr->p_paddr + phdr->p_memsz ) );
-- 
cgit v1.2.3-55-g7522