summaryrefslogtreecommitdiff
path: root/src/m
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-04-18 17:34:42 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-04-18 17:34:42 -0700
commitc2982e87d382f0b5c00a65e63716c2b43d342881 (patch)
treeb8f155c52150e3cc85a26299812d139efd86231e /src/m
parent5e073ec7384c432e42a8affeeb6d6906588f2af9 (diff)
downloademacs-c2982e87d382f0b5c00a65e63716c2b43d342881.tar.gz
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/m')
-rw-r--r--src/m/amdx86-64.h2
-rw-r--r--src/m/ia64.h2
-rw-r--r--src/m/ibms390x.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index dbca9b5b838..50fcf8e7872 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -28,7 +28,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define the type to use. */
#define EMACS_INT long
-#define pEd "ld"
+#define pI "l"
#define EMACS_UINT unsigned long
/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
diff --git a/src/m/ia64.h b/src/m/ia64.h
index a1374d7c224..7a8866a9503 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -28,7 +28,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define the type to use. */
#define EMACS_INT long
-#define pEd "ld"
+#define pI "l"
#define EMACS_UINT unsigned long
#ifdef REL_ALLOC
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 14228b61e56..04092d6e1ac 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -24,7 +24,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define the type to use. */
#define EMACS_INT long
-#define pEd "ld"
+#define pI "l"
#define EMACS_UINT unsigned long
/* On the 64 bit architecture, we can use 60 bits for addresses */