more fmt_ptr (trunk only)

diff --git a/src/botl.c b/src/botl.c
index 299e2f4ea85330295c1a1d3efcbe572ce3c49c80..5262aba4a08468d0e84248cb691f466e2d66c5f6 100644 (file)
--- a/src/botl.c
+++ b/src/botl.c
@@ -479,17 +479,22 @@ compare_blstats(bl1, bl2)
 struct istat_s *bl1, *bl2;
 {
        int anytype, result = 0;
+       char bl1_address[FMT_PTR_BUFSIZ], bl2_address[FMT_PTR_BUFSIZ];
+
        if (!bl1 || !bl2) {
-               panic("compare_blstat: bad istat pointer %ld, %ld",
-                       (long)bl1, (long)bl2);
+               char bl1_address[FMT_PTR_BUFSIZ], bl2_address[FMT_PTR_BUFSIZ];
+               panic("compare_blstat: bad istat pointer %s, %s",
+                       fmt_ptr((genericptr_t)bl1, bl1_address),
+                       fmt_ptr((genericptr_t)bl2, bl2_address));
        }
 
        anytype = bl1->anytype;
        if ((!bl1->a.a_void || !bl2->a.a_void) &&
            (anytype == ANY_IPTR || anytype == ANY_UPTR ||
             anytype == ANY_LPTR || anytype == ANY_ULPTR)) {
-               panic("compare_blstat: invalid pointer %ld, %ld",
-                       (long)bl1->a.a_void, (long)bl2->a.a_void);
+               panic("compare_blstat: invalid pointer %s, %s",
+                       fmt_ptr((genericptr_t)bl1->a.a_void, bl1_address),
+                       fmt_ptr((genericptr_t)bl2->a.a_void, bl2_address));
        }
 
        switch(anytype) {
@@ -554,8 +559,10 @@ struct istat_s *bl, *maxbl;
        int result = 0;
        int anytype;
        if (!bl || !maxbl) {
-               impossible("percentage: bad istat pointer %ld, %ld",
-                       (long)bl, (long)maxbl);
+               char bl_address[FMT_PTR_BUFSIZ], maxbl_address[FMT_PTR_BUFSIZ];
+               impossible("percentage: bad istat pointer %s, %s",
+                       fmt_ptr((genericptr_t)bl, bl_address),
+                       fmt_ptr((genericptr_t)maxbl, maxbl_address));
                return 0;
        }
 

diff --git a/src/light.c b/src/light.c
index 6ad3ae2ed09886d79c88b993a96bfe4f1dd4cdab..b041000f512becc78292c7c919f79280bd9c1a48 100644 (file)
--- a/src/light.c
+++ b/src/light.c
@@ -91,6 +91,7 @@ del_light_source(type, id)
 {
     light_source *curr, *prev;
     genericptr_t tmp_id;
+    char id_address[FMT_PTR_BUFSIZ];
 
     /* need to be prepared for dealing a with light source which
        has only been partially restored during a level change
@@ -117,7 +118,8 @@ del_light_source(type, id)
            return;
        }
     }
-    impossible("del_light_source: not found type=%d, id=0x%lx", type, (long)id);
+    impossible("del_light_source: not found type=%d, id=%s",
+               type, fmt_ptr((genericptr_t)id, id_address));
 }
 
 /* Mark locations that are temporarily lit via mobile light sources. */