src: rename tprint_or to tprint_flags_or

Co-authored-by: Dmitry V. Levin <ldv@strace.io>

32 files changed, 59 insertions, 59 deletions

diff --git a/src/bpf_filter.c b/src/bpf_filter.c
index 17a11caf3..e0815b2c2 100644
--- a/src/bpf_filter.c
+++ b/src/bpf_filter.c
@@ -43,7 +43,7 @@ print_bpf_filter_code(const uint16_t code, bool extended)
 	case BPF_STX:
 		if (!extended) {
 			if (i) {
-				tprint_or();
+				tprint_flags_or();
 				PRINT_VAL_X(i);
 				tprints_comment("BPF_???");
 			}
@@ -53,20 +53,20 @@ print_bpf_filter_code(const uint16_t code, bool extended)
 
 	case BPF_LD:
 	case BPF_LDX:
-		tprint_or();
+		tprint_flags_or();
 		printxvals(BPF_SIZE(code), "BPF_???",
 			   bpf_size, extended ? ebpf_size : NULL, NULL);
-		tprint_or();
+		tprint_flags_or();
 		printxval(mode, BPF_MODE(code), "BPF_???");
 		break;
 
 	case BPF_MISC: /* BPF_ALU64 in eBPF */
 		if (!extended) {
-			tprint_or();
+			tprint_flags_or();
 			printxval(bpf_miscop, BPF_MISCOP(code), "BPF_???");
 			i &= ~BPF_MISCOP(code);
 			if (i) {
-				tprint_or();
+				tprint_flags_or();
 				PRINT_VAL_X(i);
 				tprints_comment("BPF_???");
 			}
@@ -75,31 +75,31 @@ print_bpf_filter_code(const uint16_t code, bool extended)
 		ATTRIBUTE_FALLTHROUGH; /* extended == true */
 
 	case BPF_ALU:
-		tprint_or();
+		tprint_flags_or();
 		printxval(bpf_src, BPF_SRC(code), "BPF_???");
-		tprint_or();
+		tprint_flags_or();
 		printxvals(BPF_OP(code), "BPF_???",
 			   bpf_op_alu,
 			   extended ? ebpf_op_alu : NULL, NULL);
 		break;
 
 	case BPF_JMP:
-		tprint_or();
+		tprint_flags_or();
 		printxval(bpf_src, BPF_SRC(code), "BPF_???");
-		tprint_or();
+		tprint_flags_or();
 		printxvals(BPF_OP(code), "BPF_???",
 			   bpf_op_jmp, extended ? ebpf_op_jmp : NULL, NULL);
 		break;
 
 	case BPF_RET: /* Reserved in eBPF */
 		if (!extended) {
-			tprint_or();
+			tprint_flags_or();
 			printxval(bpf_rval, BPF_RVAL(code), "BPF_???");
 			i &= ~BPF_RVAL(code);
 		}
 
 		if (i) {
-			tprint_or();
+			tprint_flags_or();
 			PRINT_VAL_X(i);
 			tprints_comment("BPF_???");
 		}
diff --git a/src/bpf_seccomp_filter.c b/src/bpf_seccomp_filter.c
index 34948c305..82188f5c2 100644
--- a/src/bpf_seccomp_filter.c
+++ b/src/bpf_seccomp_filter.c
@@ -24,7 +24,7 @@ print_seccomp_filter_k(const struct bpf_filter_block *const fp)
 
 		printxval(seccomp_ret_action, action, "SECCOMP_RET_???");
 		if (data) {
-			tprint_or();
+			tprint_flags_or();
 			PRINT_VAL_X(data);
 		}
 
diff --git a/src/capability.c b/src/capability.c
index 69e5ecaeb..9ef5dac5d 100644
--- a/src/capability.c
+++ b/src/capability.c
@@ -83,7 +83,7 @@ print_cap_bits(const uint32_t lo, const uint32_t hi)
 
 	if (hi) {
 		if (lo)
-			tprint_or();
+			tprint_flags_or();
 		printflags(cap_mask1, hi, "CAP_???");
 	}
 }
diff --git a/src/clone.c b/src/clone.c
index 2c430f895..65c71bb7f 100644
--- a/src/clone.c
+++ b/src/clone.c
@@ -89,7 +89,7 @@ SYS_FUNC(clone)
 		if (flags) {
 			printflags64(clone_flags, flags, "CLONE_???");
 			if (sig) {
-				tprint_or();
+				tprint_flags_or();
 				printsignal(sig);
 			}
 		} else {
diff --git a/src/fanotify.c b/src/fanotify.c
index 4e56bb404..606f5cf10 100644
--- a/src/fanotify.c
+++ b/src/fanotify.c
@@ -26,7 +26,7 @@ SYS_FUNC(fanotify_init)
 	printxval(fan_classes, flags & FAN_ALL_CLASS_BITS, "FAN_CLASS_???");
 	flags &= ~FAN_ALL_CLASS_BITS;
 	if (flags) {
-		tprint_or();
+		tprint_flags_or();
 		printflags(fan_init_flags, flags, "FAN_???");
 	}
 	tprint_arg_next();
diff --git a/src/futex.c b/src/futex.c
index 1ed05d4f5..241a60ed3 100644
--- a/src/futex.c
+++ b/src/futex.c
@@ -115,24 +115,24 @@ do_futex(struct tcb *const tcp, const print_obj_by_addr_fn print_ts)
 			print_xlat(FUTEX_OP_OPARG_SHIFT);
 			tprint_shift();
 			PRINT_VAL_U(28);
-			tprint_or();
+			tprint_flags_or();
 		}
 		comment = printxval(futexwakeops, (val3 >> 28) & 0x7, NULL)
 			? NULL : "FUTEX_OP_???";
 		tprint_shift();
 		PRINT_VAL_U(28);
 		tprints_comment(comment);
-		tprint_or();
+		tprint_flags_or();
 		PRINT_VAL_X((val3 >> 12) & 0xfff);
 		tprint_shift();
 		PRINT_VAL_U(12);
-		tprint_or();
+		tprint_flags_or();
 		comment = printxval(futexwakecmps, (val3 >> 24) & 0xf, NULL)
 			? NULL : "FUTEX_OP_CMP_???";
 		tprint_shift();
 		PRINT_VAL_U(24);
 		tprints_comment(comment);
-		tprint_or();
+		tprint_flags_or();
 		PRINT_VAL_X(val3 & 0xfff);
 		break;
 	case FUTEX_WAIT_REQUEUE_PI:
diff --git a/src/ipc.c b/src/ipc.c
index e210ea48c..c165d0e34 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -19,7 +19,7 @@ SYS_FUNC(ipc)
 		PRINT_VAL_U(version);
 		tprint_shift();
 		PRINT_VAL_U(16);
-		tprint_or();
+		tprint_flags_or();
 	}
 
 	printxval_u(ipccalls, call, NULL);
diff --git a/src/ipc_defs.h b/src/ipc_defs.h
index 71f29a69b..8b7c4c8df 100644
--- a/src/ipc_defs.h
+++ b/src/ipc_defs.h
@@ -63,7 +63,7 @@
 	do {							\
 		if ((arg) & IPC_64) {				\
 			print_xlat(IPC_64);			\
-			tprint_or();				\
+			tprint_flags_or();			\
 		}						\
 		printxval((flagset), (arg) & ~IPC_64, dflt);	\
 	} while (0)
diff --git a/src/ipc_msg.c b/src/ipc_msg.c
index f3a33894d..88ac4e7c1 100644
--- a/src/ipc_msg.c
+++ b/src/ipc_msg.c
@@ -28,7 +28,7 @@ SYS_FUNC(msgget)
 
 	/* msgflg */
 	if (printflags(resource_flags, tcp->u_arg[1] & ~0777, NULL) != 0)
-		tprint_or();
+		tprint_flags_or();
 	print_numeric_umode_t(tcp->u_arg[1] & 0777);
 	return RVAL_DECODED;
 }
diff --git a/src/ipc_sem.c b/src/ipc_sem.c
index 127bc26b4..63fbc2bbf 100644
--- a/src/ipc_sem.c
+++ b/src/ipc_sem.c
@@ -113,7 +113,7 @@ SYS_FUNC(semget)
 
 	/* semflg */
 	if (printflags(resource_flags, tcp->u_arg[2] & ~0777, NULL) != 0)
-		tprint_or();
+		tprint_flags_or();
 	print_numeric_umode_t(tcp->u_arg[2] & 0777);
 	return RVAL_DECODED;
 }
diff --git a/src/ipc_shm.c b/src/ipc_shm.c
index 024b9578e..6a3cc06cd 100644
--- a/src/ipc_shm.c
+++ b/src/ipc_shm.c
@@ -48,14 +48,14 @@ SYS_FUNC(shmget)
 
 	if (hugetlb_value) {
 		if (flags)
-			tprint_or();
+			tprint_flags_or();
 		PRINT_VAL_U(hugetlb_value >> SHM_HUGE_SHIFT);
 		tprint_shift();
 		print_xlat_u(SHM_HUGE_SHIFT);
 	}
 
 	if (flags || hugetlb_value)
-		tprint_or();
+		tprint_flags_or();
 	print_numeric_umode_t(tcp->u_arg[2] & 0777);
 
 	return RVAL_DECODED;
diff --git a/src/kd_ioctl.c b/src/kd_ioctl.c
index 1ef359df0..aba5b17a2 100644
--- a/src/kd_ioctl.c
+++ b/src/kd_ioctl.c
@@ -95,7 +95,7 @@ kd_mk_tone(struct tcb *const tcp, const unsigned int arg)
 		PRINT_VAL_U(ticks);
 		tprint_shift();
 		PRINT_VAL_U(16);
-		tprint_or();
+		tprint_flags_or();
 	}
 	PRINT_VAL_U(count);
 
diff --git a/src/kexec.c b/src/kexec.c
index d0d3158ba..566d8b93b 100644
--- a/src/kexec.c
+++ b/src/kexec.c
@@ -78,7 +78,7 @@ SYS_FUNC(kexec_load)
 	printxval64(kexec_arch_values, n & KEXEC_ARCH_MASK, "KEXEC_ARCH_???");
 	n &= ~(kernel_ulong_t) KEXEC_ARCH_MASK;
 	if (n) {
-		tprint_or();
+		tprint_flags_or();
 		printflags64(kexec_load_flags, n, "KEXEC_???");
 	}
 
diff --git a/src/mem.c b/src/mem.c
index b76220199..7009ec86c 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -74,13 +74,13 @@ print_mmap_flags(kernel_ulong_t flags)
 
 	flags &= ~mask;
 	if (flags) {
-		tprint_or();
+		tprint_flags_or();
 		printflags_ex(flags, NULL, XLAT_STYLE_ABBREV,
 			      mmap_flags, NULL);
 	}
 
 	if (hugetlb_value) {
-		tprint_or();
+		tprint_flags_or();
 		PRINT_VAL_U(hugetlb_value >> MAP_HUGE_SHIFT);
 		tprint_shift();
 		/*
diff --git a/src/memfd_create.c b/src/memfd_create.c
index e13042bf5..9d9458862 100644
--- a/src/memfd_create.c
+++ b/src/memfd_create.c
@@ -42,7 +42,7 @@ SYS_FUNC(memfd_create)
 
 	if (hugetlb_value) {
 		if (flags)
-			tprint_or();
+			tprint_flags_or();
 		PRINT_VAL_U(hugetlb_value >> MFD_HUGE_SHIFT);
 		tprint_shift();
 		/*
diff --git a/src/mount.c b/src/mount.c
index 77cce53ce..a76e21ca2 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -56,7 +56,7 @@ SYS_FUNC(mount)
 	if (old_magic) {
 		print_xlat(MS_MGC_VAL);
 		if (flags)
-			tprint_or();
+			tprint_flags_or();
 	}
 	if (flags || !old_magic)
 		printflags64(mount_flags, flags, "MS_???");
diff --git a/src/net.c b/src/net.c
index 7589befa2..4694fcd4d 100644
--- a/src/net.c
+++ b/src/net.c
@@ -100,7 +100,7 @@ tprint_sock_type(unsigned int flags)
 		flags &= ~SOCK_TYPE_MASK;
 		if (!flags)
 			return;
-		tprint_or();
+		tprint_flags_or();
 	}
 	printflags(sock_type_flags, flags, "SOCK_???");
 }
diff --git a/src/netlink.c b/src/netlink.c
index 25fe7f117..80fad42c5 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -182,7 +182,7 @@ decode_nlmsg_type_netfilter(struct tcb *tcp, const struct xlat *const xlat,
 
 	tprint_shift();
 	PRINT_VAL_U(8);
-	tprint_or();
+	tprint_flags_or();
 	if (subsys_id < ARRAY_SIZE(nf_nlmsg_types))
 		printxval(nf_nlmsg_types[subsys_id].xlat,
 			  msg_type, nf_nlmsg_types[subsys_id].dflt);
diff --git a/src/nlattr.c b/src/nlattr.c
index 7fabd0e1c..638cbbc5f 100644
--- a/src/nlattr.c
+++ b/src/nlattr.c
@@ -55,11 +55,11 @@ print_nlattr(const struct nlattr *const nla,
 	tprints_field_name("nla_type");
 	if (nla->nla_type & NLA_F_NESTED) {
 		print_xlat(NLA_F_NESTED);
-		tprint_or();
+		tprint_flags_or();
 	}
 	if (nla->nla_type & NLA_F_NET_BYTEORDER) {
 		print_xlat(NLA_F_NET_BYTEORDER);
-		tprint_or();
+		tprint_flags_or();
 	}
 	printxval(table, nla->nla_type & NLA_TYPE_MASK, dflt);
 	tprint_struct_end();
diff --git a/src/numa.c b/src/numa.c
index f594da0bd..0c9cd3ec5 100644
--- a/src/numa.c
+++ b/src/numa.c
@@ -96,7 +96,7 @@ print_mode(struct tcb *const tcp, const kernel_ulong_t mode_arg)
 		tprint_comment_begin();
 
 	tprints(mode_str);
-	tprint_or();
+	tprint_flags_or();
 	printflags_ex(flags, NULL, XLAT_STYLE_ABBREV, mpol_mode_flags, NULL);
 
 	if (xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
diff --git a/src/perf.c b/src/perf.c
index 4e6a730c3..c15335cb1 100644
--- a/src/perf.c
+++ b/src/perf.c
@@ -161,7 +161,7 @@ print_perf_event_attr(struct tcb *const tcp, const kernel_ulong_t addr)
 			PRINT_VAL_X(attr->config >> 32);
 			tprint_shift();
 			PRINT_VAL_U(32);
-			tprint_or();
+			tprint_flags_or();
 		}
 		printxval(perf_hw_id, attr->config & PERF_HW_EVENT_MASK,
 			   "PERF_COUNT_HW_???");
@@ -194,25 +194,25 @@ print_perf_event_attr(struct tcb *const tcp, const kernel_ulong_t addr)
 			PRINT_VAL_X(attr->config >> 32);
 			tprint_shift();
 			PRINT_VAL_U(32);
-			tprint_or();
+			tprint_flags_or();
 		}
 		if ((attr->config & PERF_HW_EVENT_MASK) >> 24) {
 			PRINT_VAL_X((attr->config & PERF_HW_EVENT_MASK) >> 24);
 			tprint_shift();
 			PRINT_VAL_U(24);
-			tprint_or();
+			tprint_flags_or();
 		}
 		printxval(perf_hw_cache_op_result_id,
 			  (attr->config >> 16) & 0xFF,
 			  "PERF_COUNT_HW_CACHE_RESULT_???");
 		tprint_shift();
 		PRINT_VAL_U(16);
-		tprint_or();
+		tprint_flags_or();
 		printxval(perf_hw_cache_op_id, (attr->config >> 8) & 0xFF,
 			   "PERF_COUNT_HW_CACHE_OP_???");
 		tprint_shift();
 		PRINT_VAL_U(8);
-		tprint_or();
+		tprint_flags_or();
 		printxval(perf_hw_cache_id, attr->config & 0xFF,
 			  "PERF_COUNT_HW_CACHE_???");
 		break;
diff --git a/src/personality.c b/src/personality.c
index f8fb3edee..99d7558c3 100644
--- a/src/personality.c
+++ b/src/personality.c
@@ -23,7 +23,7 @@ SYS_FUNC(personality)
 			printxval(personality_types, pers & PER_MASK, "PER_???");
 			pers &= ~PER_MASK;
 			if (pers) {
-				tprint_or();
+				tprint_flags_or();
 				printflags(personality_flags, pers, NULL);
 			}
 		}
diff --git a/src/print_fields.h b/src/print_fields.h
index 813876156..bb61f071c 100644
--- a/src/print_fields.h
+++ b/src/print_fields.h
@@ -211,7 +211,7 @@ tprint_shift(void)
 }
 
 static inline void
-tprint_or(void)
+tprint_flags_or(void)
 {
 	STRACE_PRINTS("|");
 }
diff --git a/src/scsi.c b/src/scsi.c
index 875bc2710..128047186 100644
--- a/src/scsi.c
+++ b/src/scsi.c
@@ -110,7 +110,7 @@ scsi_ioctl(struct tcb *const tcp, const unsigned int code,
 			if (val & SG_SCSI_RESET_NO_ESCALATE) {
 				printxval(sg_scsi_reset,
 					  SG_SCSI_RESET_NO_ESCALATE, 0);
-				tprint_or();
+				tprint_flags_or();
 			}
 			printxval(sg_scsi_reset,
 				  val & ~SG_SCSI_RESET_NO_ESCALATE,
diff --git a/src/statx.c b/src/statx.c
index 8b44e3902..8af2969e3 100644
--- a/src/statx.c
+++ b/src/statx.c
@@ -44,7 +44,7 @@ SYS_FUNC(statx)
 			   NULL);
 		flags &= ~AT_STATX_SYNC_TYPE;
 		if (flags) {
-			tprint_or();
+			tprint_flags_or();
 			printflags(at_flags, flags, NULL);
 		}
 		tprint_arg_next();
diff --git a/src/swapon.c b/src/swapon.c
index 9e48439ff..9d7632f6c 100644
--- a/src/swapon.c
+++ b/src/swapon.c
@@ -24,7 +24,7 @@ SYS_FUNC(swapon)
 	/* swapflags */
 	if (flags) {
 		printflags(swap_flags, flags, "SWAP_FLAG_???");
-		tprint_or();
+		tprint_flags_or();
 	}
 	PRINT_VAL_U(prio);
 
diff --git a/src/tee.c b/src/tee.c
index 7d658cbdb..39ad05524 100644
--- a/src/tee.c
+++ b/src/tee.c
@@ -105,7 +105,7 @@ tee_print_param_fn(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data
 		    param->attr & ~TEE_IOCTL_PARAM_ATTR_META,
 		    "TEE_IOCTL_PARAM_ATTR_");
 	if (param->attr & TEE_IOCTL_PARAM_ATTR_META) {
-		tprint_or();
+		tprint_flags_or();
 		tprints("TEE_IOCTL_PARAM_ATTR_META");
 	}
 
diff --git a/src/term.c b/src/term.c
index 323395d56..2cf3aeb0f 100644
--- a/src/term.c
+++ b/src/term.c
@@ -58,7 +58,7 @@ decode_oflag(uint64_t val)
 
 	for (unsigned int i = 0; i < ARRAY_SIZE(xlats); i++) {
 		printxval64(xlats[i].xl, val & xlats[i].mask, xlats[i].dfl);
-		tprint_or();
+		tprint_flags_or();
 
 		val &= ~xlats[i].mask;
 	}
@@ -70,17 +70,17 @@ static void
 decode_cflag(uint64_t val)
 {
 	printxval64(baud_options, val & CBAUD, "B???");
-	tprint_or();
+	tprint_flags_or();
 
 	if (val & CIBAUD) {
 		printxval64(baud_options, (val & CIBAUD) >> IBSHIFT, "B???");
 		tprint_shift();
 		print_xlat(IBSHIFT);
-		tprint_or();
+		tprint_flags_or();
 	}
 
 	printxval64(term_cflags_csize, val & CSIZE, "CS?");
-	tprint_or();
+	tprint_flags_or();
 
 	val &= ~(CBAUD | CIBAUD | CSIZE);
 	printflags64(term_cflags, val, NULL);
diff --git a/src/util.c b/src/util.c
index 65fcf97bd..9748b4a06 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1763,7 +1763,7 @@ print_abnormal_hi(const kernel_ulong_t val)
 			PRINT_VAL_X(hi);
 			tprint_shift();
 			PRINT_VAL_U(32);
-			tprint_or();
+			tprint_flags_or();
 		}
 	}
 }
diff --git a/src/v4l2.c b/src/v4l2.c
index ef77d6b20..90d1eeca8 100644
--- a/src/v4l2.c
+++ b/src/v4l2.c
@@ -505,11 +505,11 @@ print_v4l2_buffer_flags(uint32_t val)
 
 	if (flags) {
 		printflags(v4l2_buf_flags, flags, "V4L2_BUF_FLAG_???");
-		tprint_or();
+		tprint_flags_or();
 	}
 	printxval(v4l2_buf_flags_ts_type, ts_type,
 		  "V4L2_BUF_FLAG_TIMESTAMP_???");
-	tprint_or();
+	tprint_flags_or();
 	printxval(v4l2_buf_flags_ts_src, ts_src,
 		  "V4L2_BUF_FLAG_TSTAMP_SRC_???");
 }
@@ -815,7 +815,7 @@ print_v4l2_cid(uint32_t cid, bool next_flags)
 		if (flags) {
 			printflags(v4l2_control_query_flags, flags,
 				   "V4L2_CTRL_FLAG_NEXT_???");
-			tprint_or();
+			tprint_flags_or();
 			cid &= ~flags;
 		}
 	}
diff --git a/src/wait.c b/src/wait.c
index 6ef81b4b3..9160fd6df 100644
--- a/src/wait.c
+++ b/src/wait.c
@@ -64,14 +64,14 @@ printstatus(int status)
 	if (status) {
 		unsigned int event = (unsigned int) status >> 16;
 		if (event) {
-			tprint_or();
+			tprint_flags_or();
 			printxval(ptrace_events, event, "PTRACE_EVENT_???");
 			tprint_shift();
 			PRINT_VAL_U(16);
 			status &= 0xffff;
 		}
 		if (status) {
-			tprint_or();
+			tprint_flags_or();
 			PRINT_VAL_X(status);
 		}
 	}
diff --git a/src/xlat.c b/src/xlat.c
index 10a7f7918..9844a2d52 100644
--- a/src/xlat.c
+++ b/src/xlat.c
@@ -438,7 +438,7 @@ printflags_ex(uint64_t flags, const char *dflt, enum xlat_style style,
 				    && !flags)
 					PRINT_VAL_U(0);
 				if (n++)
-					tprint_or();
+					tprint_flags_or();
 				else if (need_comment)
 					tprint_comment_begin();
 				tprints(xlat->data[idx].str);
@@ -452,7 +452,7 @@ printflags_ex(uint64_t flags, const char *dflt, enum xlat_style style,
 
 	if (n) {
 		if (flags) {
-			tprint_or();
+			tprint_flags_or();
 			print_xlat_val(flags, style);
 			n++;
 		}