[Librtas-devel] [PATCH 2.5/10] Correct multiple build warnings

[Nathan F. <nf...@li...>]

Correct the warnings produced during the build of librtas.

Signed-off-by: Nathan Fontenot <nf...@li...>

NOTE: This should have been the real patch 2/10. I'll send another
set of patches out (if needed) with the patch numbering correct.

---
 librtas_src/syscall_calls.c |   18 +++++++++---------
 librtas_src/syscall_rmo.c   |   14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/librtas_src/syscall_calls.c b/librtas_src/syscall_calls.c
index a107cf5..0ef3b2c 100644
--- a/librtas_src/syscall_calls.c
+++ b/librtas_src/syscall_calls.c
@@ -30,7 +30,7 @@ _syscall1(int, rtas, void *, args);
 
 #define CALL_AGAIN 1
 
-struct librtas_config config = { NULL, 0 };
+struct librtas_config config = { 0, 0 };
 
 /**
  * handle_delay
@@ -445,7 +445,7 @@ int rtas_get_config_addr_info2(uint32_t config_addr, uint64_t phb_id,
 
 	*info = be32toh(be_info);
 
-	dbg1("(0x%x, 0x%llx, %d) = %d, 0x%x\n", config_addr, phb_id, func,
+	dbg1("(0x%x, 0x%lx, %d) = %d, 0x%x\n", config_addr, phb_id, func,
 	     rc ? rc : status, *info);
 	return rc ? rc : status;
 }
@@ -528,7 +528,7 @@ rtas_get_indices(int is_sensor, int type, char *workarea, size_t size,
 
 	*next = be32toh(be_next);
 
-	dbg1("(%d, %d, %p, %d, %d, %p) = %d, %d\n", is_sensor, type, workarea,
+	dbg1("(%d, %d, %p, %zd, %d, %p) = %d, %d\n", is_sensor, type, workarea,
 	     size, start, next, rc ? rc : status, *next);
 	return rc ? rc : status;
 }
@@ -721,7 +721,7 @@ int rtas_get_vpd(char *loc_code, char *workarea, size_t size,
 	*seq_next = be32toh(*seq_next);
 	*bytes_ret = be32toh(*bytes_ret);
 
-	dbg1("(%s, 0x%p, %d, %d) = %d, %d, %d", loc_code ? loc_code : "NULL",
+	dbg1("(%s, 0x%p, %zd, %d) = %d, %d, %d", loc_code ? loc_code : "NULL",
 		workarea, size, sequence, status, *seq_next, *bytes_ret);
 	return rc ? rc : status;
 }
@@ -828,7 +828,7 @@ rtas_platform_dump(uint64_t dump_tag, uint64_t sequence, void *buffer,
 			break;
 
 		sequence = BITS64(be32toh(next_hi), be32toh(next_lo));
-		dbg1("%s: seq_next = 0x%llx\n", __FUNCTION__, sequence);
+		dbg1("%s: seq_next = 0x%lx\n", __FUNCTION__, sequence);
 
 		rc = handle_delay(status, &elapsed);
 	} while (rc == CALL_AGAIN);
@@ -844,7 +844,7 @@ rtas_platform_dump(uint64_t dump_tag, uint64_t sequence, void *buffer,
 	bytes_lo = be32toh(bytes_lo);
 	*bytes_ret = BITS64(bytes_hi, bytes_lo);
 
-	dbg1("(0x%llx, 0x%llx, %p, %d, %p, %p) = %d, 0x%llx, 0x%llx\n",
+	dbg1("(0x%lx, 0x%lx, %p, %zd, %p, %p) = %d, 0x%lx, 0x%lx\n",
 	     dump_tag, sequence, buffer, length, seq_next, bytes_ret,
 	     rc ? rc : status, *seq_next, *bytes_ret);
 	return rc ? rc : status;
@@ -874,7 +874,7 @@ rtas_read_slot_reset(uint32_t cfg_addr, uint64_t phbid, int *state,
 	*state = be32toh(*state);
 	*eeh = be32toh(*eeh);
 
-	dbg1("(0x%x, 0x%llx, %p, %p) = %d, %d, %d\n", cfg_addr, phbid, state,
+	dbg1("(0x%x, 0x%lx, %p, %p) = %d, %d, %d\n", cfg_addr, phbid, state,
 	     eeh, rc ? rc : status, *state, *eeh);
 	return rc ? rc : status;
 }
@@ -907,7 +907,7 @@ int rtas_scan_log_dump(void *buffer, size_t length)
 
 	(void)rtas_free_rmo_buffer(kernbuf, kernbuf_pa, length);
 
-	dbg1("(%p, %d) = %d\n", buffer, length, rc ? rc : status);
+	dbg1("(%p, %zd) = %d\n", buffer, length, rc ? rc : status);
 	return rc ? rc : status;
 }
 
@@ -978,7 +978,7 @@ rtas_set_eeh_option(uint32_t cfg_addr, uint64_t phbid, int function)
 		       htobe32(BITS32_HI(phbid)), htobe32(BITS32_LO(phbid)),
 		       htobe32(function), &status);
 
-	dbg1("(0x%x, 0x%llx, %d) = %d\n", cfg_addr, phbid, function,
+	dbg1("(0x%x, 0x%lx, %d) = %d\n", cfg_addr, phbid, function,
 	     rc ? rc : status);
 	return rc ? rc : status;
 }
diff --git a/librtas_src/syscall_rmo.c b/librtas_src/syscall_rmo.c
index cc364f4..a483f42 100644
--- a/librtas_src/syscall_rmo.c
+++ b/librtas_src/syscall_rmo.c
@@ -91,7 +91,7 @@ static int read_kregion_bounds(struct region *kregion)
 		return rc;
 	}
 
-	sscanf(buf, "%llx %x", &kregion->addr, &kregion->size);
+	sscanf(buf, "%lx %x", &kregion->addr, &kregion->size);
 	free(buf);
 
 	if (!(kregion->size && kregion->addr) ||
@@ -169,7 +169,7 @@ static int acquire_file_lock(off_t start, size_t size)
 	rc = fcntl(wa_config.lockfile_fd, F_SETLKW, &flock);
 	if (rc < 0) {
 		/* Expected to fail for regions used by other processes */
-		dbg1("fcntl failed for [0x%lx, 0x%x]\n", start, size);
+		dbg1("fcntl failed for [0x%lx, 0x%zx]\n", start, size);
 		return RTAS_IO_ASSERT;
 	}
 
@@ -196,7 +196,7 @@ static int release_file_lock(off_t start, size_t size)
 
 	rc = fcntl(wa_config.lockfile_fd, F_SETLK, &flock);
 	if (rc < 0) {
-		dbg1("fcntl failed for [0x%lx, 0x%x]\n", start, size);
+		dbg1("fcntl failed for [0x%lx, 0x%zx]\n", start, size);
 		return RTAS_IO_ASSERT;
 	}
 
@@ -219,7 +219,7 @@ static int get_phys_region(size_t size, uint32_t * phys_addr)
 	int i;
 
 	if (size > kregion->size) {
-		dbg1("Invalid buffer size 0x%x requested\n", size);
+		dbg1("Invalid buffer size 0x%zx requested\n", size);
 		return RTAS_IO_ASSERT;
 	}
 
@@ -266,7 +266,7 @@ static int release_phys_region(uint32_t phys_addr, size_t size)
 	int rc;
 
 	if (size > kregion->size) {
-		dbg1("Invalid buffer size 0x%x requested\n", size);
+		dbg1("Invalid buffer size 0x%zx requested\n", size);
 		return RTAS_IO_ASSERT;
 	}
 
@@ -276,7 +276,7 @@ static int release_phys_region(uint32_t phys_addr, size_t size)
 	bits =
 	    get_bits(first_page, first_page + n_pages - 1, wa_config.pages_map);
 	if (bits != ((1 << n_pages) - 1)) {
-		dbg1("Invalid region [0x%x, 0x%x]\n", phys_addr, size);
+		dbg1("Invalid region [0x%x, 0x%zx]\n", phys_addr, size);
 		return RTAS_IO_ASSERT;
 	}
 
@@ -447,7 +447,7 @@ int rtas_get_rmo_buffer(size_t size, void **buf, uint32_t * phys_addr)
 	int n_pages;
 	int rc;
 
-	dbg1("RMO buffer request, size: %d\n", size);
+	dbg1("RMO buffer request, size: %zd\n", size);
 
 	n_pages = size / PAGE_SIZE;