summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bpf.c24
-rw-r--r--btrfs.c2
-rw-r--r--ioctl.c2
-rw-r--r--perf_ioctl.c2
-rw-r--r--rtnl_addr.c2
-rw-r--r--v4l2.c6
6 files changed, 19 insertions, 19 deletions
diff --git a/bpf.c b/bpf.c
index b3ab9791b..af8300532 100644
--- a/bpf.c
+++ b/bpf.c
@@ -289,7 +289,7 @@ BEGIN_BPF_CMD_DECODER(BPF_PROG_LOAD)
tprints(", insns=");
print_ebpf_prog(tcp, attr.insns, attr.insn_cnt);
- tprintf(", license=");
+ tprints(", license=");
print_big_u64_addr(attr.license);
printstr(tcp, attr.license);
@@ -298,7 +298,7 @@ BEGIN_BPF_CMD_DECODER(BPF_PROG_LOAD)
break;
PRINT_FIELD_U(", ", attr, log_level);
PRINT_FIELD_U(", ", attr, log_size);
- tprintf(", log_buf=");
+ tprints(", log_buf=");
print_big_u64_addr(attr.log_buf);
printstr_ex(tcp, attr.log_buf, attr.log_size, QUOTE_0_TERMINATED);
@@ -366,7 +366,7 @@ END_BPF_CMD_DECODER(RVAL_DECODED | RVAL_FD)
BEGIN_BPF_CMD_DECODER(BPF_OBJ_PIN)
{
- tprintf("{pathname=");
+ tprints("{pathname=");
print_big_u64_addr(attr.pathname);
printpath(tcp, attr.pathname);
@@ -844,7 +844,7 @@ BEGIN_BPF_CMD_DECODER(BPF_OBJ_GET_INFO_BY_FD)
if (saved && (saved->info_len != attr.info_len))
tprintf(" => %u", attr.info_len);
- tprintf(", info=");
+ tprints(", info=");
}
print_bpf_obj_info(tcp, attr.bpf_fd, attr.info, attr.info_len, saved);
@@ -894,7 +894,7 @@ BEGIN_BPF_CMD_DECODER(BPF_RAW_TRACEPOINT_OPEN)
{
enum { TP_NAME_SIZE = 128 };
- tprintf("{raw_tracepoint={name=");
+ tprints("{raw_tracepoint={name=");
print_big_u64_addr(attr.name);
printstr_ex(tcp, attr.name, TP_NAME_SIZE, QUOTE_0_TERMINATED);
@@ -941,7 +941,7 @@ BEGIN_BPF_CMD_DECODER(BPF_TASK_FD_QUERY)
tprintf(" => %u", attr.buf_len);
const unsigned int buf_len = MIN(saved_buf_len, attr.buf_len);
- tprintf(", buf=");
+ tprints(", buf=");
print_big_u64_addr(attr.buf);
printstr_ex(tcp, attr.buf, buf_len, QUOTE_0_TERMINATED);
PRINT_FIELD_U(", ", attr, prog_id);
@@ -969,13 +969,13 @@ BEGIN_BPF_CMD_DECODER(BPF_MAP_LOOKUP_BATCH)
bpf_map_lookup_elem_flags, "BPF_???");
PRINT_FIELD_X(", ", attr, flags);
- tprintf("}");
+ tprints("}");
} else {
unsigned long count = get_tcb_priv_ulong(tcp);
if (count != attr.count) {
PRINT_FIELD_U("=> {batch={", attr, count);
- tprintf("}}");
+ tprints("}}");
}
return RVAL_DECODED;
@@ -998,13 +998,13 @@ BEGIN_BPF_CMD_DECODER(BPF_MAP_UPDATE_BATCH)
bpf_map_lookup_elem_flags, "BPF_???");
PRINT_FIELD_X(", ", attr, flags);
- tprintf("}");
+ tprints("}");
} else {
unsigned long count = get_tcb_priv_ulong(tcp);
if (count != attr.count) {
PRINT_FIELD_U("=> {batch={", attr, count);
- tprintf("}}");
+ tprints("}}");
}
return RVAL_DECODED;
@@ -1024,13 +1024,13 @@ BEGIN_BPF_CMD_DECODER(BPF_MAP_DELETE_BATCH)
bpf_map_lookup_elem_flags, "BPF_???");
PRINT_FIELD_X(", ", attr, flags);
- tprintf("}");
+ tprints("}");
} else {
unsigned long count = get_tcb_priv_ulong(tcp);
if (count != attr.count) {
PRINT_FIELD_U("=> {batch={", attr, count);
- tprintf("}}");
+ tprints("}}");
}
return RVAL_DECODED;
diff --git a/btrfs.c b/btrfs.c
index dc0d74735..9ebaf9a76 100644
--- a/btrfs.c
+++ b/btrfs.c
@@ -853,7 +853,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
if (!IS_ARRAY_ZERO(args.reserved))
PRINT_FIELD_X_ARRAY(", ", args, reserved);
- tprintf(", flags=");
+ tprints(", flags=");
printflags64(btrfs_logical_ino_args_flags, args.flags,
"BTRFS_LOGICAL_INO_ARGS_???");
PRINT_FIELD_ADDR64(", ", args, inodes);
diff --git a/ioctl.c b/ioctl.c
index de2a946fb..ba34d2dc4 100644
--- a/ioctl.c
+++ b/ioctl.c
@@ -108,7 +108,7 @@ evdev_decode_number(const unsigned int code)
if (nr >= 0x20 && nr <= 0x20 + 0x1f) {
tprints("EVIOCGBIT(");
if (nr == 0x20)
- tprintf("0");
+ tprints("0");
else
printxval_ex(evdev_ev, nr - 0x20,
abbrev ? "EV_???" : NULL,
diff --git a/perf_ioctl.c b/perf_ioctl.c
index 427aa9eb9..8e14cc663 100644
--- a/perf_ioctl.c
+++ b/perf_ioctl.c
@@ -90,7 +90,7 @@ MPERS_PRINTER_DECL(int, perf_ioctl,
case PERF_EVENT_IOC_SET_OUTPUT:
case PERF_EVENT_IOC_SET_BPF:
- tprintf(", ");
+ tprints(", ");
printfd(tcp, (int) arg);
return RVAL_IOCTL_DECODED;
diff --git a/rtnl_addr.c b/rtnl_addr.c
index e572eaa79..e8204a6fb 100644
--- a/rtnl_addr.c
+++ b/rtnl_addr.c
@@ -50,7 +50,7 @@ decode_ifa_cacheinfo(struct tcb *const tcp,
PRINT_FIELD_U(", ", ci, ifa_valid);
PRINT_FIELD_U(", ", ci, cstamp);
PRINT_FIELD_U(", ", ci, tstamp);
- tprintf("}");
+ tprints("}");
}
return true;
diff --git a/v4l2.c b/v4l2.c
index c5bacd106..3a1c49d2f 100644
--- a/v4l2.c
+++ b/v4l2.c
@@ -172,7 +172,7 @@ print_v4l2_capability(struct tcb *const tcp, const kernel_ulong_t arg)
PRINT_FIELD_CSTRING("{", caps, driver);
PRINT_FIELD_CSTRING(", ", caps, card);
PRINT_FIELD_CSTRING(", ", caps, bus_info);
- tprintf(", version=");
+ tprints(", version=");
print_kernel_version(caps.version);
tprints(", capabilities=");
printflags(v4l2_device_capabilities_flags, caps.capabilities,
@@ -399,7 +399,7 @@ print_v4l2_requestbuffers(struct tcb *const tcp, const kernel_ulong_t arg)
if (umove_or_printaddr(tcp, arg, &reqbufs))
return RVAL_IOCTL_DECODED;
- tprintf("{type=");
+ tprints("{type=");
printxval(v4l2_buf_types, reqbufs.type, "V4L2_BUF_TYPE_???");
tprints(", memory=");
printxval(v4l2_memories, reqbufs.memory, "V4L2_MEMORY_???");
@@ -591,7 +591,7 @@ print_v4l2_streamparm(struct tcb *const tcp, const kernel_ulong_t arg,
printflags(v4l2_streaming_capabilities,
s.parm.output.capability, "V4L2_CAP_???");
- tprintf(", outputmode=");
+ tprints(", outputmode=");
printflags(v4l2_capture_modes,
s.parm.output.outputmode, "V4L2_MODE_???");
View Lorry Controller Status