Bug 702151: Avoid truncating pointers in debug code.

Introduce a PRI_INTPTR and use that to consistently display
pointers. We avoid using %p, as that displays inconsistently
between platforms. Sometimes it does 0x%x, sometimes just %x.

2 files changed, 5 insertions, 3 deletions

diff --git a/xps/xpshash.c b/xps/xpshash.c
index 3ff3d3e73..2c27f6ff6 100644
--- a/xps/xpshash.c
+++ b/xps/xpshash.c
@@ -214,7 +214,8 @@ xps_hash_debug(xps_hash_table_t *table)
         if (!table->entries[i].value)
             dlprintf1("table % 4d: empty\n", i);
         else
-            dlprintf3("table % 4d: key=%s value=%p\n", i,
-                      table->entries[i].key, table->entries[i].value);
+            dlprintf3("table % 4d: key=%s value="PRI_INTPTR"\n", i,
+                      table->entries[i].key,
+                      (intptr_t)table->entries[i].value);
     }
 }
diff --git a/xps/xpsresource.c b/xps/xpsresource.c
index fdcf1876e..6fb5c2e68 100644
--- a/xps/xpsresource.c
+++ b/xps/xpsresource.c
@@ -208,7 +208,8 @@ xps_debug_resource_dictionary(xps_context_t *ctx, xps_resource_t *dict)
     {
         if (dict->base_uri)
             dmprintf1(ctx->memory, "URI = '%s'\n", dict->base_uri);
-        dmprintf2(ctx->memory, "KEY = '%s' VAL = %p\n", dict->name, dict->data);
+        dmprintf2(ctx->memory, "KEY = '%s' VAL = "PRI_INTPTR"\n",
+                  dict->name, (intptr_t)dict->data);
         if (dict->parent)
         {
             dmputs(ctx->memory, "PARENT = {\n");