Introduce generic STRINGIFY and STRINGIFY_VAL macros

[strace] / fetch_struct_statfs.c

diff --git a/fetch_struct_statfs.c b/fetch_struct_statfs.c
index 0717e4b2d9d6f2b921039c2ca8b234dda6ac1519..4fba0f75d790a328e1ea8e0b1661a8fc3524df82 100644 (file)
--- a/fetch_struct_statfs.c
+++ b/fetch_struct_statfs.c
@@ -39,42 +39,35 @@ typedef struct statfs64 struct_statfs64;
 
 #include "statfs.h"
 
-#define ASSIGN_NUMBER(dst, src)                                \
-       if (sizeof(src) == sizeof(int))                 \
-               dst = (unsigned int) (src);             \
-       else if (sizeof(src) == sizeof(long))           \
-               dst = (unsigned long) (src);            \
-       else                                            \
-               dst = (unsigned long long) (src)
-
 MPERS_PRINTER_DECL(bool, fetch_struct_statfs,
-                  struct tcb *tcp, const long addr, struct strace_statfs *p)
+                  struct tcb *const tcp, const kernel_ulong_t addr,
+                  struct strace_statfs *const p)
 {
        struct_statfs b;
 
        if (umove_or_printaddr(tcp, addr, &b))
                return false;
 
-       ASSIGN_NUMBER(p->f_type, b.f_type);
-       ASSIGN_NUMBER(p->f_bsize, b.f_bsize);
-       ASSIGN_NUMBER(p->f_blocks, b.f_blocks);
-       ASSIGN_NUMBER(p->f_bfree, b.f_bfree);
-       ASSIGN_NUMBER(p->f_bavail, b.f_bavail);
-       ASSIGN_NUMBER(p->f_files, b.f_files);
-       ASSIGN_NUMBER(p->f_ffree, b.f_ffree);
+       p->f_type = zero_extend_signed_to_ull(b.f_type);
+       p->f_bsize = zero_extend_signed_to_ull(b.f_bsize);
+       p->f_blocks = zero_extend_signed_to_ull(b.f_blocks);
+       p->f_bfree = zero_extend_signed_to_ull(b.f_bfree);
+       p->f_bavail = zero_extend_signed_to_ull(b.f_bavail);
+       p->f_files = zero_extend_signed_to_ull(b.f_files);
+       p->f_ffree = zero_extend_signed_to_ull(b.f_ffree);
 #if defined HAVE_STRUCT_STATFS_F_FSID_VAL
-       ASSIGN_NUMBER(p->f_fsid[0], b.f_fsid.val[0]);
-       ASSIGN_NUMBER(p->f_fsid[1], b.f_fsid.val[1]);
+       p->f_fsid[0] = zero_extend_signed_to_ull(b.f_fsid.val[0]);
+       p->f_fsid[1] = zero_extend_signed_to_ull(b.f_fsid.val[1]);
 #elif defined HAVE_STRUCT_STATFS_F_FSID___VAL
-       ASSIGN_NUMBER(p->f_fsid[0], b.f_fsid.__val[0]);
-       ASSIGN_NUMBER(p->f_fsid[1], b.f_fsid.__val[1]);
+       p->f_fsid[0] = zero_extend_signed_to_ull(b.f_fsid.__val[0]);
+       p->f_fsid[1] = zero_extend_signed_to_ull(b.f_fsid.__val[1]);
 #endif
-       ASSIGN_NUMBER(p->f_namelen, b.f_namelen);
+       p->f_namelen = zero_extend_signed_to_ull(b.f_namelen);
 #ifdef HAVE_STRUCT_STATFS_F_FRSIZE
-       ASSIGN_NUMBER(p->f_frsize, b.f_frsize);
+       p->f_frsize = zero_extend_signed_to_ull(b.f_frsize);
 #endif
 #ifdef HAVE_STRUCT_STATFS_F_FLAGS
-       ASSIGN_NUMBER(p->f_flags, b.f_flags);
+       p->f_flags = zero_extend_signed_to_ull(b.f_flags);
 #endif
 
        return true;
@@ -86,12 +79,12 @@ MPERS_PRINTER_DECL(bool, fetch_struct_statfs,
 #endif
 
 MPERS_PRINTER_DECL(bool, fetch_struct_statfs64,
-                  struct tcb *tcp, const long addr, const unsigned long size,
-                  struct strace_statfs *p)
+                  struct tcb *const tcp, const kernel_ulong_t addr,
+                  const kernel_ulong_t size, struct strace_statfs *const p)
 {
        struct_statfs64 b;
 
-        if (sizeof(b) != size
+       if (sizeof(b) != size
 #ifdef COMPAT_STATFS64_PADDED_SIZE
            && sizeof(b) != COMPAT_STATFS64_PADDED_SIZE
 #endif
@@ -103,26 +96,26 @@ MPERS_PRINTER_DECL(bool, fetch_struct_statfs64,
        if (umove_or_printaddr(tcp, addr, &b))
                return false;
 
-       ASSIGN_NUMBER(p->f_type, b.f_type);
-       ASSIGN_NUMBER(p->f_bsize, b.f_bsize);
-       ASSIGN_NUMBER(p->f_blocks, b.f_blocks);
-       ASSIGN_NUMBER(p->f_bfree, b.f_bfree);
-       ASSIGN_NUMBER(p->f_bavail, b.f_bavail);
-       ASSIGN_NUMBER(p->f_files, b.f_files);
-       ASSIGN_NUMBER(p->f_ffree, b.f_ffree);
+       p->f_type = zero_extend_signed_to_ull(b.f_type);
+       p->f_bsize = zero_extend_signed_to_ull(b.f_bsize);
+       p->f_blocks = zero_extend_signed_to_ull(b.f_blocks);
+       p->f_bfree = zero_extend_signed_to_ull(b.f_bfree);
+       p->f_bavail = zero_extend_signed_to_ull(b.f_bavail);
+       p->f_files = zero_extend_signed_to_ull(b.f_files);
+       p->f_ffree = zero_extend_signed_to_ull(b.f_ffree);
 #if defined HAVE_STRUCT_STATFS64_F_FSID_VAL
-       ASSIGN_NUMBER(p->f_fsid[0], b.f_fsid.val[0]);
-       ASSIGN_NUMBER(p->f_fsid[1], b.f_fsid.val[1]);
+       p->f_fsid[0] = zero_extend_signed_to_ull(b.f_fsid.val[0]);
+       p->f_fsid[1] = zero_extend_signed_to_ull(b.f_fsid.val[1]);
 #elif defined HAVE_STRUCT_STATFS64_F_FSID___VAL
-       ASSIGN_NUMBER(p->f_fsid[0], b.f_fsid.__val[0]);
-       ASSIGN_NUMBER(p->f_fsid[1], b.f_fsid.__val[1]);
+       p->f_fsid[0] = zero_extend_signed_to_ull(b.f_fsid.__val[0]);
+       p->f_fsid[1] = zero_extend_signed_to_ull(b.f_fsid.__val[1]);
 #endif
-       ASSIGN_NUMBER(p->f_namelen, b.f_namelen);
+       p->f_namelen = zero_extend_signed_to_ull(b.f_namelen);
 #ifdef HAVE_STRUCT_STATFS64_F_FRSIZE
-       ASSIGN_NUMBER(p->f_frsize, b.f_frsize);
+       p->f_frsize = zero_extend_signed_to_ull(b.f_frsize);
 #endif
 #ifdef HAVE_STRUCT_STATFS64_F_FLAGS
-       ASSIGN_NUMBER(p->f_flags, b.f_flags);
+       p->f_flags = zero_extend_signed_to_ull(b.f_flags);
 #endif
 
        return true;