From 8aab60e8d304f622dbe69c634b4dd209c70c9e83 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 26 Dec 2016 05:17:29 +0300 Subject: [PATCH] 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. --- bjm.c | 2 +- defs.h | 8 +------- mem.c | 2 +- util.c | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/bjm.c b/bjm.c index 03a078ce..5d3b6053 100644 --- 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 054ca01a..c161de9b 100644 --- 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 7979b14f..0a4d3b94 100644 --- 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 88af9978..099bd388 100644 --- 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"); -- 2.40.0