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.

diff --git a/defs.h b/defs.h
index ac4c539d0ca4039456e2e3661bb30d8c776e7466..73a47a64f11f80503e69cb00599eb73285469b24 100644 (file)
--- 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 7dc6863ef3812f081785b86ba062a0527469b66e..72c5251efd05ae68d190919eb8c199f62dfdc73a 100644 (file)
--- 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)