Replace "(unsigned long) -1L" with -1UL

[strace] / dirent.c

diff --git a/dirent.c b/dirent.c
index bad9bcdea1d9bbeae1828e6031e47bce10182b7b..936453e07a243c7ce75989b89e63e1d93324a452 100644 (file)
--- a/dirent.c
+++ b/dirent.c
@@ -33,8 +33,6 @@
 
 #include DEF_MPERS_TYPE(kernel_dirent)
 
-#include "kernel_types.h"
-
 #include MPERS_DEFS
 
 #define D_NAME_LEN_MAX 256
@@ -47,9 +45,9 @@ print_old_dirent(struct tcb *tcp, long addr)
        if (umove_or_printaddr(tcp, addr, &d))
                return;
 
-       tprintf("{d_ino=%Lu, d_off=%Lu, d_reclen=%u, d_name=",
-               (unsigned long long) d.d_ino,
-               (unsigned long long) d.d_off, d.d_reclen);
+       tprintf("{d_ino=%llu, d_off=%llu, d_reclen=%u, d_name=",
+               zero_extend_signed_to_ull(d.d_ino),
+               zero_extend_signed_to_ull(d.d_off), d.d_reclen);
        if (d.d_reclen > D_NAME_LEN_MAX)
                d.d_reclen = D_NAME_LEN_MAX;
        printpathn(tcp, addr + offsetof(kernel_dirent, d_name), d.d_reclen);
@@ -76,16 +74,19 @@ SYS_FUNC(readdir)
 SYS_FUNC(getdents)
 {
        unsigned int i, len, dents = 0;
-       char *buf;
+       unsigned char *buf;
 
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
                return 0;
        }
+
+       const unsigned int count = tcp->u_arg[2];
+
        if (syserror(tcp) || !verbose(tcp)) {
                printaddr(tcp->u_arg[1]);
-               tprintf(", %lu", tcp->u_arg[2]);
+               tprintf(", %u", count);
                return 0;
        }
 
@@ -101,7 +102,7 @@ SYS_FUNC(getdents)
                buf = malloc(len);
                if (!buf || umoven(tcp, tcp->u_arg[1], len, buf) < 0) {
                        printaddr(tcp->u_arg[1]);
-                       tprintf(", %lu", tcp->u_arg[2]);
+                       tprintf(", %u", count);
                        free(buf);
                        return 0;
                }
@@ -122,10 +123,11 @@ SYS_FUNC(getdents)
                        if (d_name_len > D_NAME_LEN_MAX)
                                d_name_len = D_NAME_LEN_MAX;
 
-                       tprintf("%s{d_ino=%Lu, d_off=%Lu, d_reclen=%u"
+                       tprintf("%s{d_ino=%llu, d_off=%llu, d_reclen=%u"
                                ", d_name=", i ? ", " : "",
-                               (unsigned long long) d->d_ino,
-                               (unsigned long long) d->d_off, d->d_reclen);
+                               zero_extend_signed_to_ull(d->d_ino),
+                               zero_extend_signed_to_ull(d->d_off),
+                               d->d_reclen);
 
                        if (print_quoted_string(d->d_name, d_name_len,
                                                QUOTE_0_TERMINATED) > 0) {
@@ -150,7 +152,7 @@ SYS_FUNC(getdents)
                tprints("]");
        else
                tprintf("/* %u entries */", dents);
-       tprintf(", %lu", tcp->u_arg[2]);
+       tprintf(", %u", count);
        free(buf);
        return 0;
 }