From a98151cf9ab69eaa610f3967e1f248276e14a459 Mon Sep 17 00:00:00 2001
From: "nethack.allison" <nethack.allison>
Date: Sun, 2 Jul 2006 19:09:42 +0000
Subject: [PATCH] more fmt_ptr (trunk only)

---
 src/botl.c  | 19 +++++++++++++------
 src/light.c |  4 +++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/botl.c b/src/botl.c
index 299e2f4ea..5262aba4a 100644
--- 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 6ad3ae2ed..b041000f5 100644
--- 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. */
-- 
2.40.0