diff options
author | Eugene Syromyatnikov <evgsyr@gmail.com> | 2021-09-13 18:26:54 +0200 |
---|---|---|
committer | Eugene Syromyatnikov <evgsyr@gmail.com> | 2021-10-11 14:39:39 +0200 |
commit | ab754d6d62e603b76f75d216faa07f6eaa564aa3 (patch) | |
tree | dae856ce49bb09de561703274a41c70f2c24a931 /src/print_statfs.c | |
parent | 835c65c0ed1ecf07147200cca01aa84ae6b0c8e2 (diff) | |
download | strace-ab754d6d62e603b76f75d216faa07f6eaa564aa3.tar.gz |
util: unify differently-sized variants of print_{,u,x}int_array_member
Different functions are more or less unnecessary, since the argument
size is passed in elem_size parameter anyway, and without any check
of it the only thing differently-sized function variants do is concealing
the discrepancies between the printed and fetched element size (as it
was with bpf_prog_info.map_ids).
All the callers are updated automatically using
sed -i 's/print_\([xu]\)\?int\(8\|16\|32\|64\)_array_member/print_\1int_array_member/g' \
`git grep -l 'print_.*int.*_array_member'`
with additional manual cleanup in src/linux/*/arch_*.c.
* src/defs.h (print_int8_array_member, print_uint8_array_member,
print_xint8_array_member, print_int32_array_member,
print_uint32_array_member, print_xint32_array_member,
print_uint64_array_member, print_xint64_array_member,
print_xlong_array_member, print_kulong_array_member): Remove.
(print_int_array_member, print_uint_array_member,
print_xint_array_member): New declarations.
* src/util.c (print_int8_array_member, print_uint8_array_member,
print_xint8_array_member, print_int32_array_member,
print_uint32_array_member, print_xint32_array_member,
print_uint64_array_member, print_xint64_array_member): Remove.
(print_int_array_member, print_uint_array_member,
print_xint_array_member): New functions.
* src/bpf.c (print_bpf_prog_info,
BEGIN_BPF_CMD_DECODER(BPF_PROG_QUERY)): Use print_uint_array_member
instead of print_uint32_array_member.
* src/btrfs.c (btrfs_print_qgroup_inherit): Use print_uint_array_member
instead of print_uint64_array_member.
* src/clone.c (SYS_FUNC(clone3)): Use print_int_array_member instead
of print_int32_array_member.
* src/evdev.c (decode_bitset): Use print_xint_array_member instead
of print_xlong_array_member.
(mtslots_ioctl): Use print_int_array_member instead
of print_int32_array_member.
* src/gpio_ioctl.c (print_gpiohandle_request): Use
print_uint_array_member instead of print_uint32_array_member
and print_uint8_array_member.
(print_gpiohandle_data, print_gpiohandle_set_config): Use
print_uint_array_member instead of print_uint8_array_member.
(print_gpio_v2_line_request): Use print_uint_array_member instead
of print_uint32_array_member.
* src/io_uring.c (SYS_FUNC(io_uring_setup), print_io_uring_probe): Use
print_xint_array_member instead of print_xint32_array_member.
* src/keyctl.c (keyctl_dh_compute, print_pkey_query,
fetch_print_pkey_params): Likewise.
* src/msghdr.c (print_cmsg_uint): Use print_uint_array_member instead
of print_uint32_array_member.
(print_cmsg_xint8_t): Use print_xint_array_member instead
of print_xint8_array_member.
* src/mtd.c (print_xint32x2_array_member, decode_nand_oobinfo,
decode_nand_ecclayout_user): Use print_xint_array_member instead
of print_xint32_array_member.
* src/net.c (print_getsockopt): Use print_uint_array_member instead
of print_uint32_array_member.
* src/nlattr.c (decode_nla_meminfo): Likewise.
* src/numa.c (SYS_FUNC(move_pages)): Use print_int_array_member instead
of print_int32_array_member.
* src/perf_ioctl.c (perf_ioctl_query_bpf): Use print_uint_array_member
instead of print_uint32_array_member.
* src/print_statfs.c (print_f_fsid): Use print_xint_array_member instead
of print_xint64_array_member.
* src/ptrace_syscall_info.c (print_psi_entry, print_psi_seccomp):
Likewise.
* src/rtnl_link.c (decode_ifla_bridge_id): Use print_uint_array_member
instead of print_uint8_array_member.
(decode_ifla_inet_conf, decode_ifla_inet6_conf): Use
print_int_array_member instead of print_int32_array_member.
(decode_ifla_inet6_stats, decode_ifla_inet6_icmp6_stats): Use
print_uint_array_member instead of print_uint64_array_member.
* src/seccomp_ioctl.c (print_struct_seccomp_data): Use
print_xint_array_member instead of print_xint64_array_member.
* src/sysinfo.c (SYS_FUNC(sysinfo)): Use print_uint_array_member instead
of print_kulong_array_member.
* src/v4l2.c (print_v4l2_queryctrl): Use print_xint_array_member instead
of print_xint32_array_member.
(print_v4l2_query_ext_ctrl): Use print_uint_array_member instead
of print_uint32_array_member; use print_xint_array_member instead
of print_xint32_array_member.
* src/linux/aarch64/arch_prstatus_regset.c
(arch_decode_prstatus_regset): Use print_xint_array_member instead
of print_xint64_array_member.
* src/linux/arm/arch_prstatus_regset.c (arch_decode_prstatus_regset):
Use print_xint_array_member instead of print_xint32_array_member.
* src/linux/i386/arch_fpregset.c (arch_decode_fpregset): Likewise.
* src/linux/mips/arch_prstatus_regset.c (arch_decode_prstatus_regset):
Use print_xint_array_member instead of print_xint32_array_member
and print_xint64_array_member.
* src/linux/mips/arch_pt_regs.c (arch_decode_pt_regs): Use
print_xint_array_member instead of print_xint64_array_member.
* src/linux/powerpc/arch_fpregset.c (arch_decode_fpregset): Likewise.
* src/linux/powerpc/arch_prstatus_regset.c (arch_decode_prstatus_regset):
Use print_xint_array_member instead of print_xint32_array_member
and print_xint64_array_member.
* src/linux/powerpc/arch_pt_regs64.c (decode_pt_regs64): Use
print_xint_array_member instead of print_xint64_array_member
* src/linux/s390/arch_prstatus_regset.c (arch_decode_prstatus_regset):
Use print_xint_array_member instead of print_xint32_array_member
and print_xint64_array_member.
(arch_decode_prstatus_regset): Use print_xint_array_member instead
of print_xint32_array_member.
* src/linux/sparc/arch_prstatus_regset.c (arch_decode_prstatus_regset):
Use print_xint_array_member instead of print_xint32_array_member.
* src/linux/sparc/arch_pt_regs.c (arch_decode_pt_regs): Likewise.
* src/linux/sparc64/arch_prstatus_regset.c
(arch_decode_prstatus_regset): Use print_xint_array_member instead
of print_xint64_array_member.
* src/linux/sparc64/arch_pt_regs64.c (decode_pt_regs64): Likewise.
* src/linux/x86_64/arch_fpregset.c (arch_decode_fpregset): Use
print_xint_array_member instead of print_xint32_array_member.
Diffstat (limited to 'src/print_statfs.c')
-rw-r--r-- | src/print_statfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/print_statfs.c b/src/print_statfs.c index 1713dbe3a..a30bb3198 100644 --- a/src/print_statfs.c +++ b/src/print_statfs.c @@ -19,7 +19,7 @@ print_f_fsid(const typeof_field(struct strace_statfs, f_fsid) *const p, struct tcb *const tcp) { tprint_struct_begin(); - PRINT_FIELD_ARRAY(*p, val, tcp, print_xint64_array_member); + PRINT_FIELD_ARRAY(*p, val, tcp, print_xint_array_member); tprint_struct_end(); } #endif |