diff options
author | Dmitry V. Levin <ldv@strace.io> | 2022-11-12 08:00:00 +0000 |
---|---|---|
committer | Dmitry V. Levin <ldv@strace.io> | 2022-11-12 08:00:00 +0000 |
commit | 58f6072399ac154566479529a6669468c4e7316e (patch) | |
tree | 31fabde89fee2f685f3769e1261b8f72c8eee34e | |
parent | ebc5d9e24fe8870ae7a8e3d95a9f12f9cf7a7533 (diff) | |
download | strace-58f6072399ac154566479529a6669468c4e7316e.tar.gz |
tprint_array_index_end: remove extra whitespace from the output
* src/print_fields.h (tprint_array_index_end): Remove extra whitespace
from the output around '='.
* tests/btrfs.c (btrfs_test_get_dev_stats_ioctl): Update expected
output.
* tests/io_uring_register.c (main): Likewise.
* tests/nlattr_ifla_af_inet6.h (print_arr_val, print_arr_uval): Likewise.
* tests/nlattr_ifstats.c (PR_FIELD_, FIELD_STR_): Likewise.
* tests/nlattr_inet_diag_msg.c (print_uint): Likewise.
-rw-r--r-- | src/print_fields.h | 2 | ||||
-rw-r--r-- | tests/btrfs.c | 6 | ||||
-rw-r--r-- | tests/io_uring_register.c | 14 | ||||
-rw-r--r-- | tests/nlattr_ifla_af_inet6.h | 8 | ||||
-rw-r--r-- | tests/nlattr_ifstats.c | 6 | ||||
-rw-r--r-- | tests/nlattr_inet_diag_msg.c | 2 |
6 files changed, 19 insertions, 19 deletions
diff --git a/src/print_fields.h b/src/print_fields.h index b1afb6d51..fe674da1c 100644 --- a/src/print_fields.h +++ b/src/print_fields.h @@ -99,7 +99,7 @@ tprint_array_index_begin(void) static inline void tprint_array_index_end(void) { - STRACE_PRINTS("] = "); + STRACE_PRINTS("]="); } static inline void diff --git a/tests/btrfs.c b/tests/btrfs.c index 867d93213..89c419b99 100644 --- a/tests/btrfs.c +++ b/tests/btrfs.c @@ -1674,11 +1674,11 @@ btrfs_test_get_dev_stats_ioctl(void) if (name) { if (verbose_xlat) - printf("[%u /* %s */] = ", i, name); + printf("[%u /* %s */]=", i, name); else - printf("[%s] = ", name); + printf("[%s]=", name); } else { - printf("[%u] = ", i); + printf("[%u]=", i); } printf("%" PRI__u64, args.values[i]); diff --git a/tests/io_uring_register.c b/tests/io_uring_register.c index 2261e6b3a..b95d06546 100644 --- a/tests/io_uring_register.c +++ b/tests/io_uring_register.c @@ -952,20 +952,20 @@ main(void) sys_io_uring_register(fd_null, 19, arg_maxw_end - 1, 2); printf("io_uring_register(%u<%s>, " XLAT_KNOWN(0x13, "IORING_REGISTER_IOWQ_MAX_WORKERS") ", [[" - XLAT_KNOWN(0, "IO_WQ_BOUND") "] = 3202329837, ... /* %p */]" + XLAT_KNOWN(0, "IO_WQ_BOUND") "]=3202329837, ... /* %p */]" ", 2) = %s\n", fd_null, path_null, arg_maxw_end, errstr); sys_io_uring_register(fd_null, 19, arg_maxw, 3); printf("io_uring_register(%u<%s>, " XLAT_KNOWN(0x13, "IORING_REGISTER_IOWQ_MAX_WORKERS") ", " - "[[" XLAT_KNOWN(0, "IO_WQ_BOUND") "] = 0, [" - XLAT_KNOWN(1, "IO_WQ_UNBOUND") "] = 1, [" - XLAT_UNKNOWN(2, "IO_WQ_???") "] = 3202329837] => " + "[[" XLAT_KNOWN(0, "IO_WQ_BOUND") "]=0, [" + XLAT_KNOWN(1, "IO_WQ_UNBOUND") "]=1, [" + XLAT_UNKNOWN(2, "IO_WQ_???") "]=3202329837] => " #if RETVAL_INJECTED - "[[" XLAT_KNOWN(0, "IO_WQ_BOUND") "] = 0, [" - XLAT_KNOWN(1, "IO_WQ_UNBOUND") "] = 1, [" - XLAT_UNKNOWN(2, "IO_WQ_???") "] = 3202329837]" + "[[" XLAT_KNOWN(0, "IO_WQ_BOUND") "]=0, [" + XLAT_KNOWN(1, "IO_WQ_UNBOUND") "]=1, [" + XLAT_UNKNOWN(2, "IO_WQ_???") "]=3202329837]" #else "%p" #endif diff --git a/tests/nlattr_ifla_af_inet6.h b/tests/nlattr_ifla_af_inet6.h index 9df320f1b..3f05cf638 100644 --- a/tests/nlattr_ifla_af_inet6.h +++ b/tests/nlattr_ifla_af_inet6.h @@ -16,9 +16,9 @@ static void print_arr_val(uint32_t *val, size_t idx, const char *idx_str) { if (idx_str) - printf("[%s] = ", idx_str); + printf("[%s]=", idx_str); else - printf("[%zu] = ", idx); + printf("[%zu]=", idx); printf("%d", *val); } @@ -27,9 +27,9 @@ static void print_arr_uval(uint64_t *val, size_t idx, const char *idx_str) { if (idx_str) - printf("[%s] = ", idx_str); + printf("[%s]=", idx_str); else - printf("[%zu] = ", idx); + printf("[%zu]=", idx); printf("%" PRIu64, *val); } diff --git a/tests/nlattr_ifstats.c b/tests/nlattr_ifstats.c index 71db7125a..ba5355946 100644 --- a/tests/nlattr_ifstats.c +++ b/tests/nlattr_ifstats.c @@ -207,7 +207,7 @@ print_mcast_stats(struct br_mcast_stats *br_xst_mc) { #define PR_FIELD_(pfx_, field_) \ printf(pfx_ #field_ "=[[" XLAT_KNOWN(0, "BR_MCAST_DIR_RX") \ - "] = %llu, [" XLAT_KNOWN(1, "BR_MCAST_DIR_TX") "] = %llu]", \ + "]=%llu, [" XLAT_KNOWN(1, "BR_MCAST_DIR_TX") "]=%llu]", \ (unsigned long long) br_xst_mc->field_[0], \ (unsigned long long) br_xst_mc->field_[1]) @@ -363,8 +363,8 @@ check_xstats(const int fd, unsigned int cmd, const char *cmd_str) 2 * NLA_HDRLEN + sizeof(br_xst_mc)); #define FIELD_STR_(field_) \ - #field_ "=[[" XLAT_KNOWN(0, "BR_MCAST_DIR_RX") "] = 0, [" \ - XLAT_KNOWN(1, "BR_MCAST_DIR_TX") "] = 0]" + #field_ "=[[" XLAT_KNOWN(0, "BR_MCAST_DIR_RX") "]=0, [" \ + XLAT_KNOWN(1, "BR_MCAST_DIR_TX") "]=0]" memset(&br_xst_mc, 0, sizeof(br_xst_mc)); TEST_NESTED_NLATTR_OBJECT_EX_(fd, nlh_mc, hdrlen, diff --git a/tests/nlattr_inet_diag_msg.c b/tests/nlattr_inet_diag_msg.c index 290c8508f..f4b727913 100644 --- a/tests/nlattr_inet_diag_msg.c +++ b/tests/nlattr_inet_diag_msg.c @@ -139,7 +139,7 @@ print_uint(const unsigned int *p, size_t i) else printf("[%s", sk_meminfo_strs[i]); - printf("] = %u", *p); + printf("]=%u", *p); } static const struct { |