Merge adjacent tprint's
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/ipc.c b/ipc.c
index 0cd7750..0b91a52 100644
--- a/ipc.c
+++ b/ipc.c
@@ -146,10 +146,9 @@
{
if (entering(tcp)) {
if (tcp->u_arg[0])
- tprintf("%#lx", tcp->u_arg[0]);
+ tprintf("%#lx, ", tcp->u_arg[0]);
else
- tprints("IPC_PRIVATE");
- tprints(", ");
+ tprints("IPC_PRIVATE, ");
if (printflags(resource_flags, tcp->u_arg[1] & ~0777, NULL) != 0)
tprints("|");
tprintf("%#lo", tcp->u_arg[1] & 0777);
@@ -348,8 +347,7 @@
tprintf("%#lx", tcp->u_arg[0]);
else
tprints("IPC_PRIVATE");
- tprintf(", %lu", tcp->u_arg[1]);
- tprints(", ");
+ tprintf(", %lu, ", tcp->u_arg[1]);
if (printflags(resource_flags, tcp->u_arg[2] & ~0777, NULL) != 0)
tprints("|");
tprintf("%#lo", tcp->u_arg[2] & 0777);
@@ -360,8 +358,7 @@
int sys_semctl(struct tcb *tcp)
{
if (entering(tcp)) {
- tprintf("%lu", tcp->u_arg[0]);
- tprintf(", %lu, ", tcp->u_arg[1]);
+ tprintf("%lu, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
PRINTCTL(semctl_flags, tcp->u_arg[2], "SEM_???");
tprintf(", %#lx", tcp->u_arg[3]);
}
@@ -375,8 +372,7 @@
tprintf("%#lx", tcp->u_arg[0]);
else
tprints("IPC_PRIVATE");
- tprintf(", %lu", tcp->u_arg[1]);
- tprints(", ");
+ tprintf(", %lu, ", tcp->u_arg[1]);
if (printflags(shm_resource_flags, tcp->u_arg[2] & ~0777, NULL) != 0)
tprints("|");
tprintf("%#lo", tcp->u_arg[2] & 0777);
@@ -403,12 +399,10 @@
if (exiting(tcp)) {
tprintf("%lu", tcp->u_arg[0]);
if (indirect_ipccall(tcp)) {
- tprintf(", %#lx", tcp->u_arg[3]);
- tprints(", ");
+ tprintf(", %#lx, ", tcp->u_arg[3]);
printflags(shm_flags, tcp->u_arg[1], "SHM_???");
} else {
- tprintf(", %#lx", tcp->u_arg[1]);
- tprints(", ");
+ tprintf(", %#lx, ", tcp->u_arg[1]);
printflags(shm_flags, tcp->u_arg[2], "SHM_???");
}
if (syserror(tcp))
@@ -452,7 +446,7 @@
/* mode */
tprintf(", %#lo, ", tcp->u_arg[2]);
if (umove(tcp, tcp->u_arg[3], &attr) < 0)
- tprints("{ ??? }");
+ tprints("{???}");
else
tprintf("{mq_maxmsg=%ld, mq_msgsize=%ld}",
(long) attr.mq_maxmsg,