aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorPaul Eggert2011-04-18 17:34:42 -0700
committerPaul Eggert2011-04-18 17:34:42 -0700
commitc2982e87d382f0b5c00a65e63716c2b43d342881 (patch)
treeb8f155c52150e3cc85a26299812d139efd86231e /src/alloc.c
parent5e073ec7384c432e42a8affeeb6d6906588f2af9 (diff)
downloademacs-c2982e87d382f0b5c00a65e63716c2b43d342881.tar.gz
emacs-c2982e87d382f0b5c00a65e63716c2b43d342881.zip
Replace pEd with more-general pI, and fix some printf arg casts.
* lisp.h (pI): New macro, generalizing old pEd macro to other conversion specifiers. For example, use "...%"pI"d..." rather than "...%"pEd"...". (pEd): Remove. All uses replaced with similar uses of pI. * src/m/amdx86-64.h, src/m/ia64.h, src/m/ibms390x.h: Likewise. * alloc.c (check_pure_size): Don't overflow by converting size to int. * bidi.c (bidi_dump_cached_states): Use pI to avoid cast. * data.c (Fnumber_to_string): Use pI instead of if-then-else-abort. * dbusbind.c (xd_append_arg): Use pI to avoid cast. (Fdbus_method_return_internal, Fdbus_method_error_internal): Likewise. * font.c (font_unparse_xlfd): Avoid potential buffer overrun on 64-bit hosts. (font_unparse_xlfd, font_unparse_fcname): Use pI to avoid casts. * keyboard.c (record_char, modify_event_symbol): Use pI to avoid casts. * print.c (safe_debug_print, print_object): Likewise. (print_object): Don't overflow by converting EMACS_INT or EMACS_UINT to int. Use pI instead of if-then-else-abort. Use %p to avoid casts. * process.c (Fmake_network_process): Use pI to avoid cast. * region-cache.c (pp_cache): Likewise. * xdisp.c (decode_mode_spec): Likewise. * xrdb.c (x_load_resources) [USE_MOTIF]: Use pI to avoid undefined behavior on 64-bit hosts with printf arg. * xselect.c (x_queue_event): Use %p to avoid casts. (x_stop_queuing_selection_requests): Likewise. (x_get_window_property): Don't truncate byte count to an 'int' when tracing.
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c
index f2aeaa938eb..423c1f167db 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4563,8 +4563,9 @@ void
4563check_pure_size (void) 4563check_pure_size (void)
4564{ 4564{
4565 if (pure_bytes_used_before_overflow) 4565 if (pure_bytes_used_before_overflow)
4566 message ("emacs:0:Pure Lisp storage overflow (approx. %d bytes needed)", 4566 message (("emacs:0:Pure Lisp storage overflow (approx. %"pI"d"
4567 (int) (pure_bytes_used + pure_bytes_used_before_overflow)); 4567 " bytes needed)"),
4568 pure_bytes_used + pure_bytes_used_before_overflow);
4568} 4569}
4569 4570
4570 4571