Add printaddr_ull, change printaddr into a thin wrapper around it

* defs.h (printaddr_ull): New prototype.
(printaddr): Change to a static inline wrapper around printaddr_ull.
* util.c (printaddr): Rename to printaddr_ull, change argument type
to unsigned long long, change print format to %#llx.

diff --git a/defs.h b/defs.h
index 7dc9ccef44c292d31f33f4454633883b3794a537..5eb9b1085fe658914e159e0cb41a248cdff46429 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -542,7 +542,7 @@ extern int getllval(struct tcb *, unsigned long long *, int);
 extern int printllval(struct tcb *, const char *, int)
        ATTRIBUTE_FORMAT((printf, 2, 0));
 
-extern void printaddr(long);
+extern void printaddr_ull(unsigned long long);
 extern void printxvals(const uint64_t, const char *, const struct xlat *, ...)
        ATTRIBUTE_SENTINEL;
 extern long long getarg_ll(struct tcb *tcp, int argn);
@@ -671,6 +671,12 @@ extern void unwind_print_stacktrace(struct tcb* tcp);
 extern void unwind_capture_stacktrace(struct tcb* tcp);
 #endif
 
+static inline void
+printaddr(unsigned long addr)
+{
+       printaddr_ull(addr);
+}
+
 static inline void
 printstr(struct tcb *tcp, long addr, long len)
 {

diff --git a/util.c b/util.c
index 99e8e2e62fc8962888a1cb51899a1b5bc8a61bfe..69da3ee306a4bd24a5882a93d9f8f93bf8dcea4b 100644 (file)
--- a/util.c
+++ b/util.c
@@ -406,12 +406,12 @@ printflags64(const struct xlat *xlat, uint64_t flags, const char *dflt)
 }
 
 void
-printaddr(const long addr)
+printaddr_ull(const unsigned long long addr)
 {
        if (!addr)
                tprints("NULL");
        else
-               tprintf("%#lx", addr);
+               tprintf("%#llx", addr);
 }
 
 #define DEF_PRINTNUM(name, type) \