diff options
-rw-r--r-- | hurd/ChangeLog | 4 | ||||
-rw-r--r-- | hurd/stddef.h | 2 | ||||
-rw-r--r-- | libc-parts/ChangeLog | 4 | ||||
-rw-r--r-- | libc-parts/s-printf.h | 3 | ||||
-rw-r--r-- | libhurd-mm/ChangeLog | 6 | ||||
-rw-r--r-- | libhurd-mm/as-build.c | 16 |
6 files changed, 26 insertions, 9 deletions
diff --git a/hurd/ChangeLog b/hurd/ChangeLog index 737dfa2..346a2aa 100644 --- a/hurd/ChangeLog +++ b/hurd/ChangeLog @@ -1,5 +1,9 @@ 2008-06-23 Neal H. Walfield <neal@gnu.org> + * stddef.h (panic_): Use gcc's format attribute. + +2008-06-23 Neal H. Walfield <neal@gnu.org> + * cap.h (OBJECT_PRIORITY_DEFAULT): Define. 2008-06-22 Neal H. Walfield <neal@gnu.org> diff --git a/hurd/stddef.h b/hurd/stddef.h index e6b5518..c313501 100644 --- a/hurd/stddef.h +++ b/hurd/stddef.h @@ -83,7 +83,7 @@ extern int output_debug; /* Print an error message and fail. This function must be provided by the run-time. */ -extern void __attribute__ ((__noreturn__)) +extern void __attribute__ ((__noreturn__, format (printf, 3, 4))) panic_ (const char *func, int line, const char *fmt, ...); #define panic(fmt, args...) \ diff --git a/libc-parts/ChangeLog b/libc-parts/ChangeLog index a17202f..8c1ff9b 100644 --- a/libc-parts/ChangeLog +++ b/libc-parts/ChangeLog @@ -1,3 +1,7 @@ +2008-06-23 Neal H. Walfield <neal@gnu.org> + + * s-printf.h (s_printf): Use gcc's format attribute. + 2008-06-22 Neal H. Walfield <neal@gnu.org> * process-spawn.c (process_spawn): [! NDEBUG]: Only free folios diff --git a/libc-parts/s-printf.h b/libc-parts/s-printf.h index 001fdcf..19065b7 100644 --- a/libc-parts/s-printf.h +++ b/libc-parts/s-printf.h @@ -39,7 +39,8 @@ extern int s_puts (const char *str); extern int s_cputs (int (*putchar) (int), const char *str); -extern int s_printf (const char *fmt, ...); +extern int s_printf (const char *fmt, ...) + __attribute__ ((format (printf, 1, 2))); extern int s_cprintf (int (*putchar) (int), const char *fmt, ...); diff --git a/libhurd-mm/ChangeLog b/libhurd-mm/ChangeLog index e18d3de..c120241 100644 --- a/libhurd-mm/ChangeLog +++ b/libhurd-mm/ChangeLog @@ -1,5 +1,11 @@ 2008-06-23 Neal H. Walfield <neal@gnu.org> + * as-build.c (as_build): Use %p, not %x, for printing a pointer. + When printing addresses, be sure to wrap them in ADDR_PRINTF. + Remove a gratuitous ADDR_FMT. + +2008-06-23 Neal H. Walfield <neal@gnu.org> + * pager.c (pager_deinit): Drop PAGER->LOCK before calling MAP_DESTROY. diff --git a/libhurd-mm/as-build.c b/libhurd-mm/as-build.c index 12fc861..589799d 100644 --- a/libhurd-mm/as-build.c +++ b/libhurd-mm/as-build.c @@ -205,14 +205,14 @@ ID (as_build) (activity_t activity, { addr_t pte_addr = addr_chop (addr, remaining); - DEBUG (5, "Cap at " ADDR_FMT ": " CAP_FMT " -> " ADDR_FMT " (%x); " + DEBUG (5, "Cap at " ADDR_FMT ": " CAP_FMT " -> " ADDR_FMT " (%p); " "remaining: %d", ADDR_PRINTF (pte_addr), CAP_PRINTF (pte), ADDR_PRINTF (addr_chop (addr, remaining - CAP_GUARD_BITS (pte))), #ifdef RM_INTERN - 0, + NULL, #else cap_get_shadow (pte), #endif @@ -471,13 +471,15 @@ ID (as_build) (activity_t activity, addr_extend (pte_addr, pte_guard, pte_gbits))) { PANIC ("old pte target: " ADDR_FMT " != pivot target: " ADDR_FMT, - addr_extend (pte_addr, pte_guard, pte_gbits), - addr_extend (pivot_addr, pivot_guard, pivot_gbits)); + ADDR_PRINTF (addr_extend (pte_addr, + pte_guard, pte_gbits)), + ADDR_PRINTF (addr_extend (pivot_addr, + pivot_guard, pivot_gbits))); } DEBUG (5, ADDR_FMT ": indirecting pte at " ADDR_FMT " -> " ADDR_FMT " " CAP_FMT " with page table/%d at " - ADDR_FMT "(%x) " "common guard: %d, remaining: %d; " + ADDR_FMT "(%p) " "common guard: %d, remaining: %d; " "old target (need pivot: %d) now via pt[%d] " "(" ADDR_FMT "-> " DEBUG_BOLD (ADDR_FMT) ")", ADDR_PRINTF (addr), @@ -487,7 +489,7 @@ ID (as_build) (activity_t activity, CAP_PRINTF (pte), pt_width, ADDR_PRINTF (pt_addr), #ifdef RM_INTERN - 0, + NULL, #else cap_get_shadow (&pt_cap), #endif @@ -592,7 +594,7 @@ ID (as_build) (activity_t activity, default: AS_DUMP; PANIC ("Can't insert object at " ADDR_FMT ": " - ADDR_FMT ": " CAP_FMT " does translate address bits", + CAP_FMT " does translate address bits", ADDR_PRINTF (addr), CAP_PRINTF (pte)); } |