Remove printaddr_klu

After transition from long to kernel_ulong_t we no longer need
two versions of printaddr function.

* defs.h (printaddr): Remove.
(printaddr_klu): Rename to printaddr.
* util.c (printaddr_klu): Likewise.
* bjm.c (SYS_FUNC(init_module)): Replace printaddr_klu with printaddr.
* mem.c (do_mprotect): Likewise.

diff --git a/bjm.c b/bjm.c
index 03a078ceaa13aa953d3dad92504db02c0d588c0e..5d3b6053e283745dd179c9a1565e93dd03d83586 100644 (file)
--- a/bjm.c
+++ b/bjm.c
@@ -44,7 +44,7 @@ SYS_FUNC(delete_module)
 
 SYS_FUNC(init_module)
 {
-       printaddr_klu(getarg_klu(tcp, 0));
+       printaddr(getarg_klu(tcp, 0));
        tprintf(", %" PRI_klu ", ", getarg_klu(tcp, 1));
        printstr(tcp, tcp->u_arg[2]);
 

diff --git a/defs.h b/defs.h
index 054ca01a299b37e1321177b57f48b15e5e8cc051..c161de9b4e30a3b27ff646091d3912bfa41c6b7d 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -580,7 +580,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_klu(kernel_ulong_t addr);
+extern void printaddr(kernel_ulong_t addr);
 extern int printxvals(const uint64_t, const char *, const struct xlat *, ...)
        ATTRIBUTE_SENTINEL;
 extern int printxval_searchn(const struct xlat *xlat, size_t xlat_size,
@@ -758,12 +758,6 @@ extern void unwind_print_stacktrace(struct tcb* tcp);
 extern void unwind_capture_stacktrace(struct tcb* tcp);
 #endif
 
-static inline void
-printaddr(kernel_ulong_t addr)
-{
-       printaddr_klu(addr);
-}
-
 static inline void
 printstrn(struct tcb *tcp, kernel_ulong_t addr, kernel_ulong_t len)
 {

diff --git a/mem.c b/mem.c
index 7979b14fade72064cccf436e3253364e627e45ce..0a4d3b94762c4024d8ee768be3cbe8d17a5aa7fa 100644 (file)
--- a/mem.c
+++ b/mem.c
@@ -185,7 +185,7 @@ SYS_FUNC(munmap)
 static int
 do_mprotect(struct tcb *tcp, bool has_pkey)
 {
-       printaddr_klu(getarg_klu(tcp, 0));
+       printaddr(getarg_klu(tcp, 0));
        tprintf(", %" PRI_klu ", ", getarg_klu(tcp, 1));
        printflags64(mmap_prot, getarg_klu(tcp, 2), "PROT_???");
 

diff --git a/util.c b/util.c
index 88af997845fa9ade83e26c608cafa1cfe5b73bc6..099bd38833bd08bf71f997ed4d30ab5e31ec1af5 100644 (file)
--- a/util.c
+++ b/util.c
@@ -462,7 +462,7 @@ printflags64(const struct xlat *xlat, uint64_t flags, const char *dflt)
 }
 
 void
-printaddr_klu(const kernel_ulong_t addr)
+printaddr(const kernel_ulong_t addr)
 {
        if (!addr)
                tprints("NULL");