32bit: fixup printf format specifiers.

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

diff --git a/kernel/arch/x86_32/page_mappings_arch.c b/kernel/arch/x86_32/page_mappings_arch.c
index 17e310c..a752d81 100644 (file)
--- a/kernel/arch/x86_32/page_mappings_arch.c
+++ b/kernel/arch/x86_32/page_mappings_arch.c
@@ -271,7 +271,7 @@ errval_t caps_copy_to_vnode(struct cte *dest_vnode_cte, cslot_t dest_slot,
     if (src_cte->mapping_info.pte) {
         // already mapped
 #if DIAGNOSTIC_ON_ERROR
-        printf("caps_copy_to_vnode: this copy is already mapped @0x%lx\n", src_cte->mapping_info.pte);
+        printf("caps_copy_to_vnode: this copy is already mapped @0x%"PRIxLPADDR"\n", src_cte->mapping_info.pte);
 #endif
 #if RETURN_ON_ERROR
         return SYS_ERR_VM_ALREADY_MAPPED;
@@ -303,7 +303,7 @@ errval_t caps_copy_to_vnode(struct cte *dest_vnode_cte, cslot_t dest_slot,
 
     errval_t r = handler_func(dest_cap, dest_slot, src_cap, flags, offset, pte_count);
     if (err_is_fail(r)) {
-        printf("caps_copy_to_vnode: handler func returned %ld\n", r);
+        printf("caps_copy_to_vnode: handler func returned %"PRIuERRV"\n", r);
     }
 #if 0
     else {

diff --git a/kernel/paging_generic.c b/kernel/paging_generic.c
index 58bb90b..3750026 100644 (file)
--- a/kernel/paging_generic.c
+++ b/kernel/paging_generic.c
@@ -172,7 +172,7 @@ errval_t lookup_cap_for_mapping(genpaddr_t paddr, lvaddr_t pte, struct cte **ret
 #endif
     errval_t err = mdb_find_cap_for_address(paddr, &mem);
     if (err_is_fail(err)) {
-        printf("could not find a cap for 0x%"PRIxGENPADDR" (%ld)\n", paddr, err);
+        printf("could not find a cap for 0x%"PRIxGENPADDR" (%"PRIuERRV")\n", paddr, err);
         return err;
     }
 #if 0

diff --git a/lib/ahci/ahci.c b/lib/ahci/ahci.c
index 601e520..962d04a 100644 (file)
--- a/lib/ahci/ahci.c
+++ b/lib/ahci/ahci.c
@@ -467,7 +467,7 @@ errval_t ahci_close(struct ahci_binding *_binding, struct event_closure _continu
     // unmap controller memory
     errval_t err = cap_destroy(_binding->port_info.hba_cap);
     if (err_is_fail(err)) {
-        printf("cap_destroy: %s (%ld)\n", err_getstring(err), err);
+        printf("cap_destroy: %s (%"PRIuERRV")\n", err_getstring(err), err);
     }
     ahci_mgmt_close_call__tx(mgmt_binding, NOP_CONT, _binding->port_id);
 

diff --git a/lib/barrelfish/debug.c b/lib/barrelfish/debug.c
index a4b12c0..c89fead 100644 (file)
--- a/lib/barrelfish/debug.c
+++ b/lib/barrelfish/debug.c
@@ -110,7 +110,7 @@ void debug_printf(const char *fmt, ...)
     char str[256];
     size_t len;
 
-    len = snprintf(str, sizeof(str), "\033[34m%.*s.\033[31m%u.%lu\033[0m: ", DISP_NAME_LEN, disp_name(),
+    len = snprintf(str, sizeof(str), "\033[34m%.*s.\033[31m%u.%"PRIuPTR"\033[0m: ", DISP_NAME_LEN, disp_name(),
                    disp_get_core_id(), thread_id());
     if (len < sizeof(str)) {
         va_start(argptr, fmt);