From 00785bf73a416aa3b9be9e29a70695fdc05a263a Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sat, 24 Dec 2016 19:24:37 +0000 Subject: [PATCH] printstr*: change len argument type from long to kernel_ureg_t * defs.h (printstr_ex, printstrn): Change len argument type from long to kernel_ureg_t. * util.c (printstr_ex): Likewise. --- defs.h | 4 ++-- util.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/defs.h b/defs.h index ac4c539d..73a47a64 100644 --- a/defs.h +++ b/defs.h @@ -613,7 +613,7 @@ extern void dumpstr(struct tcb *, kernel_ureg_t addr, int len); extern void -printstr_ex(struct tcb *, kernel_ureg_t addr, long len, +printstr_ex(struct tcb *, kernel_ureg_t addr, kernel_ureg_t len, unsigned int user_style); #define DECL_PRINTNUM(name) \ @@ -765,7 +765,7 @@ printaddr(kernel_ureg_t addr) } static inline void -printstrn(struct tcb *tcp, kernel_ureg_t addr, long len) +printstrn(struct tcb *tcp, kernel_ureg_t addr, kernel_ureg_t len) { printstr_ex(tcp, addr, len, 0); } diff --git a/util.c b/util.c index 7dc6863e..72c5251e 100644 --- a/util.c +++ b/util.c @@ -857,8 +857,8 @@ printpath(struct tcb *const tcp, const kernel_ureg_t addr) * or QUOTE_0_TERMINATED bit is set and the string length exceeds `len'. */ void -printstr_ex(struct tcb *const tcp, const kernel_ureg_t addr, const long len, - const unsigned int user_style) +printstr_ex(struct tcb *const tcp, const kernel_ureg_t addr, + const kernel_ureg_t len, const unsigned int user_style) { static char *str = NULL; static char *outstr; @@ -884,8 +884,8 @@ printstr_ex(struct tcb *const tcp, const kernel_ureg_t addr, const long len, /* Fetch one byte more because string_quote may look one byte ahead. */ size = max_strlen + 1; - if (size > (unsigned long) len) - size = (unsigned long) len; + if (size > len) + size = len; if (style & QUOTE_0_TERMINATED) rc = umovestr(tcp, addr, size, str); else @@ -907,7 +907,7 @@ printstr_ex(struct tcb *const tcp, const kernel_ureg_t addr, const long len, ellipsis = string_quote(str, outstr, size, style) && len && ((style & QUOTE_0_TERMINATED) - || (unsigned long) len > max_strlen); + || len > max_strlen); tprints(outstr); if (ellipsis) -- 2.40.0