diff options
author | Dmitry V. Levin <ldv@strace.io> | 2021-01-29 08:00:00 +0000 |
---|---|---|
committer | Dmitry V. Levin <ldv@strace.io> | 2021-01-29 08:00:00 +0000 |
commit | 067fad7ff06eef78bbfcdff0af5968bba5e6779b (patch) | |
tree | 17ebef749e3f3476dc1522b3893582a32dbd3710 | |
parent | 5ba5884b0f213e5a1ac9069002622373f602d1eb (diff) | |
download | strace-067fad7ff06eef78bbfcdff0af5968bba5e6779b.tar.gz |
treewide: replace tprints("...") with tprint_more_data_follows()
This applies to all users of print_fields.h macros except tests.
-rw-r--r-- | bpf.c | 4 | ||||
-rw-r--r-- | bpf_filter.c | 2 | ||||
-rw-r--r-- | btrfs.c | 8 | ||||
-rw-r--r-- | dm.c | 12 | ||||
-rw-r--r-- | fs_0x94_ioctl.c | 2 | ||||
-rw-r--r-- | kvm.c | 2 | ||||
-rw-r--r-- | mmsghdr.c | 2 | ||||
-rw-r--r-- | msghdr.c | 4 | ||||
-rw-r--r-- | netlink.c | 4 | ||||
-rw-r--r-- | netlink_inet_diag.c | 6 | ||||
-rw-r--r-- | netlink_netlink_diag.c | 4 | ||||
-rw-r--r-- | netlink_packet_diag.c | 4 | ||||
-rw-r--r-- | netlink_smc_diag.c | 4 | ||||
-rw-r--r-- | netlink_unix_diag.c | 4 | ||||
-rw-r--r-- | nlattr.c | 4 | ||||
-rw-r--r-- | rtnl_addr.c | 2 | ||||
-rw-r--r-- | rtnl_addrlabel.c | 2 | ||||
-rw-r--r-- | rtnl_dcb.c | 2 | ||||
-rw-r--r-- | rtnl_link.c | 2 | ||||
-rw-r--r-- | rtnl_mdb.c | 2 | ||||
-rw-r--r-- | rtnl_neigh.c | 2 | ||||
-rw-r--r-- | rtnl_route.c | 2 | ||||
-rw-r--r-- | rtnl_rule.c | 2 | ||||
-rw-r--r-- | rtnl_tc.c | 2 | ||||
-rw-r--r-- | sockaddr.c | 2 |
25 files changed, 43 insertions, 43 deletions
@@ -89,7 +89,7 @@ decode_attr_extra_data(struct tcb *const tcp, if (data[i]) { tprints(", "); if (abbrev(tcp)) { - tprints("..."); + tprint_more_data_follows(); } else { tprintf("/* bytes %zu..%zu */ ", attr_size, attr_size + size - 1); @@ -123,7 +123,7 @@ print_ebpf_insn(struct tcb * const tcp, void * const elem_buf, struct ebpf_insn *insn = elem_buf; if (eid->count++ >= BPF_MAXINSNS) { - tprints("..."); + tprint_more_data_follows(); return false; } diff --git a/bpf_filter.c b/bpf_filter.c index f465908aa..acb517173 100644 --- a/bpf_filter.c +++ b/bpf_filter.c @@ -139,7 +139,7 @@ print_bpf_filter_block(struct tcb *const tcp, void *const elem_buf, struct bpf_filter_block_data *const fbd = data; if (fbd->count++ >= BPF_MAXINSNS) { - tprints("..."); + tprint_more_data_follows(); return false; } @@ -434,7 +434,7 @@ decode_search_arg_buf(struct tcb *tcp, kernel_ulong_t buf_addr, uint64_t buf_siz return; tprints(", "); if (abbrev(tcp)) { - tprints("..."); + tprint_more_data_follows(); } else { tprints("buf=["); uint64_t off = 0; @@ -445,11 +445,11 @@ decode_search_arg_buf(struct tcb *tcp, kernel_ulong_t buf_addr, uint64_t buf_siz uint64_t addr = buf_addr + off; if (addr < buf_addr || off + sizeof(sh) > buf_size || i > max_strlen) { - tprints("..."); + tprint_more_data_follows(); break; } if (!tfetch_mem(tcp, addr, sizeof(sh), &sh)) { - tprints("..."); + tprint_more_data_follows(); printaddr_comment(addr); break; } @@ -905,7 +905,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl, if (i) tprints(", "); if (i >= ARRAY_SIZE(args.values)) { - tprints("..."); + tprint_more_data_follows(); break; } @@ -147,7 +147,7 @@ dm_decode_dm_target_spec(struct tcb *const tcp, const kernel_ulong_t addr, goto misplaced; if (i >= max_strlen) { - tprints("..."); + tprint_more_data_follows(); break; } @@ -207,7 +207,7 @@ dm_decode_dm_target_deps(struct tcb *const tcp, const kernel_ulong_t addr, tprints(", "); if (abbrev(tcp)) { - tprints("..."); + tprint_more_data_follows(); return; } @@ -278,7 +278,7 @@ dm_decode_dm_name_list(struct tcb *const tcp, const kernel_ulong_t addr, goto misplaced; if (count >= max_strlen) { - tprints("..."); + tprint_more_data_follows(); break; } @@ -364,7 +364,7 @@ dm_decode_dm_target_versions(struct tcb *const tcp, const kernel_ulong_t addr, goto misplaced; if (count >= max_strlen) { - tprints("..."); + tprint_more_data_follows(); break; } @@ -400,7 +400,7 @@ dm_decode_dm_target_msg(struct tcb *const tcp, const kernel_ulong_t addr, tprints(", "); if (abbrev(tcp)) { - tprints("..."); + tprint_more_data_follows(); return; } @@ -434,7 +434,7 @@ dm_decode_string(struct tcb *const tcp, const kernel_ulong_t addr, tprints(", "); if (abbrev(tcp)) { - tprints("..."); + tprint_more_data_follows(); return; } diff --git a/fs_0x94_ioctl.c b/fs_0x94_ioctl.c index 0bace0bb6..35503bc95 100644 --- a/fs_0x94_ioctl.c +++ b/fs_0x94_ioctl.c @@ -41,7 +41,7 @@ print_file_dedupe_range_info(struct tcb *tcp, void *elem_buf, if (count) { if (*count == 0) { - tprints("..."); + tprint_more_data_follows(); return false; } --*count; @@ -279,7 +279,7 @@ kvm_ioctl_decode_cpuid2(struct tcb *const tcp, const unsigned int code, if (abbrev(tcp)) { tprints("["); if (cpuid.nent) - tprints("..."); + tprint_more_data_follows(); tprints("]"); } else { @@ -39,7 +39,7 @@ print_struct_mmsghdr(struct tcb *tcp, void *elem_buf, struct print_struct_mmsghdr_config *const c = data; if (!c->count) { - tprints("..."); + tprint_more_data_follows(); return false; } --c->count; @@ -54,7 +54,7 @@ print_scm_rights(struct tcb *tcp, const void *cmsg_data, if (i) tprints(", "); if (abbrev(tcp) && i >= max_strlen) { - tprints("..."); + tprint_more_data_follows(); break; } printfd(tcp, fds[i]); @@ -191,7 +191,7 @@ print_cmsg_ip_opts(struct tcb *tcp, const void *cmsg_data, if (i) tprints(", "); if (abbrev(tcp) && i >= max_strlen) { - tprints("..."); + tprint_more_data_follows(); break; } tprintf("0x%02x", opts[i]); @@ -61,7 +61,7 @@ fetch_nlmsghdr(struct tcb *const tcp, struct nlmsghdr *const nlmsghdr, return true; if (in_array) { - tprints("..."); + tprint_more_data_follows(); printaddr_comment(addr); } else { printaddr(addr); @@ -639,7 +639,7 @@ decode_netlink(struct tcb *const tcp, for (elt = 0; fetch_nlmsghdr(tcp, &nlmsghdr, addr, len, is_array); elt++) { if (abbrev(tcp) && elt == max_strlen) { - tprints("..."); + tprint_more_data_follows(); break; } diff --git a/netlink_inet_diag.c b/netlink_inet_diag.c index 2f08d48f5..d1c3552c6 100644 --- a/netlink_inet_diag.c +++ b/netlink_inet_diag.c @@ -215,7 +215,7 @@ decode_inet_diag_req_compat(struct tcb *const tcp, decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(req)); @@ -261,7 +261,7 @@ decode_inet_diag_req_v2(struct tcb *const tcp, decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(req)); @@ -446,7 +446,7 @@ DECL_NETLINK_DIAG_DECODER(decode_inet_diag_msg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(msg)); diff --git a/netlink_netlink_diag.c b/netlink_netlink_diag.c index 272febb83..1d1995933 100644 --- a/netlink_netlink_diag.c +++ b/netlink_netlink_diag.c @@ -50,7 +50,7 @@ DECL_NETLINK_DIAG_DECODER(decode_netlink_diag_req) PRINT_FIELD_COOKIE(req, ndiag_cookie); } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); } @@ -174,7 +174,7 @@ DECL_NETLINK_DIAG_DECODER(decode_netlink_diag_msg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(msg)); diff --git a/netlink_packet_diag.c b/netlink_packet_diag.c index 927e145a3..1611b0d2d 100644 --- a/netlink_packet_diag.c +++ b/netlink_packet_diag.c @@ -48,7 +48,7 @@ DECL_NETLINK_DIAG_DECODER(decode_packet_diag_req) PRINT_FIELD_COOKIE(req, pdiag_cookie); } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); } @@ -205,7 +205,7 @@ DECL_NETLINK_DIAG_DECODER(decode_packet_diag_msg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(msg)); diff --git a/netlink_smc_diag.c b/netlink_smc_diag.c index b25858acb..23b6065d4 100644 --- a/netlink_smc_diag.c +++ b/netlink_smc_diag.c @@ -54,7 +54,7 @@ DECL_NETLINK_DIAG_DECODER(decode_smc_diag_req) PRINT_FIELD_INET_DIAG_SOCKID(req, id, AF_INET); } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); } @@ -270,7 +270,7 @@ DECL_NETLINK_DIAG_DECODER(decode_smc_diag_msg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(msg)); diff --git a/netlink_unix_diag.c b/netlink_unix_diag.c index e3ab8cf19..3ddce5b98 100644 --- a/netlink_unix_diag.c +++ b/netlink_unix_diag.c @@ -44,7 +44,7 @@ DECL_NETLINK_DIAG_DECODER(decode_unix_diag_req) PRINT_FIELD_COOKIE(req, udiag_cookie); } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); } @@ -157,7 +157,7 @@ DECL_NETLINK_DIAG_DECODER(decode_unix_diag_msg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(msg)); @@ -33,7 +33,7 @@ fetch_nlattr(struct tcb *const tcp, struct nlattr *const nlattr, return true; if (in_array) { - tprints("..."); + tprint_more_data_follows(); printaddr_comment(addr); } else { printaddr(addr); @@ -126,7 +126,7 @@ decode_nlattr(struct tcb *const tcp, for (elt = 0; fetch_nlattr(tcp, &nla, addr, len, is_array); elt++) { if (abbrev(tcp) && elt == max_strlen) { - tprints("..."); + tprint_more_data_follows(); break; } diff --git a/rtnl_addr.c b/rtnl_addr.c index 968704517..eec4fa4fc 100644 --- a/rtnl_addr.c +++ b/rtnl_addr.c @@ -115,7 +115,7 @@ DECL_NETLINK_ROUTE_DECODER(decode_ifaddrmsg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(ifaddr)); diff --git a/rtnl_addrlabel.c b/rtnl_addrlabel.c index 8abb52463..cbe3cd39d 100644 --- a/rtnl_addrlabel.c +++ b/rtnl_addrlabel.c @@ -62,7 +62,7 @@ DECL_NETLINK_ROUTE_DECODER(decode_ifaddrlblmsg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(ifal)); diff --git a/rtnl_dcb.c b/rtnl_dcb.c index e8bd4c50f..174df1b38 100644 --- a/rtnl_dcb.c +++ b/rtnl_dcb.c @@ -40,7 +40,7 @@ DECL_NETLINK_ROUTE_DECODER(decode_dcbmsg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(dcb)); diff --git a/rtnl_link.c b/rtnl_link.c index 6d9e8e3a7..6c0ac09b7 100644 --- a/rtnl_link.c +++ b/rtnl_link.c @@ -1011,7 +1011,7 @@ DECL_NETLINK_ROUTE_DECODER(decode_ifinfomsg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(ifinfo)); diff --git a/rtnl_mdb.c b/rtnl_mdb.c index 094a34d26..91df2ccd6 100644 --- a/rtnl_mdb.c +++ b/rtnl_mdb.c @@ -198,7 +198,7 @@ DECL_NETLINK_ROUTE_DECODER(decode_br_port_msg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(bpm)); diff --git a/rtnl_neigh.c b/rtnl_neigh.c index 2a309e16d..2b869556e 100644 --- a/rtnl_neigh.c +++ b/rtnl_neigh.c @@ -105,7 +105,7 @@ DECL_NETLINK_ROUTE_DECODER(decode_ndmsg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(ndmsg)); diff --git a/rtnl_route.c b/rtnl_route.c index 60c731da1..35526381e 100644 --- a/rtnl_route.c +++ b/rtnl_route.c @@ -313,7 +313,7 @@ DECL_NETLINK_ROUTE_DECODER(decode_rtmsg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(rtmsg)); diff --git a/rtnl_rule.c b/rtnl_rule.c index 8987c81b1..a569b362f 100644 --- a/rtnl_rule.c +++ b/rtnl_rule.c @@ -130,7 +130,7 @@ DECL_NETLINK_ROUTE_DECODER(decode_fib_rule_hdr) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(msg)); @@ -335,7 +335,7 @@ DECL_NETLINK_ROUTE_DECODER(decode_tcmsg) decode_nla = true; } } else - tprints("..."); + tprint_more_data_follows(); tprint_struct_end(); offset = NLMSG_ALIGN(sizeof(tcmsg)); diff --git a/sockaddr.c b/sockaddr.c index bebd82df6..79a9da430 100644 --- a/sockaddr.c +++ b/sockaddr.c @@ -481,7 +481,7 @@ print_sockaddr_data_ll(struct tcb *tcp, const void *const buf, if (i) tprints(", "); if (i >= oob_halen) { - tprints("..."); + tprint_more_data_follows(); break; } tprintf("%#02x", sa_ll->sll_addr[i]); |