glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge adjacent tprint's

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-02-23 20:07:44 +01:00
parent b43dacd6d1
commit 859ea8b8cc
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bjm.c
View File

@ -195,8 +195,7 @@ int
sys_init_module(struct tcb *tcp)
{
if (entering(tcp)) {
tprintf("%#lx, ", tcp->u_arg[0]);
tprintf("%lu, ", tcp->u_arg[1]);
tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
printstr(tcp, tcp->u_arg[2], -1);
}
return 0;

22
ipc.c
View File

@ -146,10 +146,9 @@ int sys_msgget(struct tcb *tcp)
{
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 @@ int sys_semget(struct tcb *tcp)
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_semget(struct tcb *tcp)
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 @@ int sys_shmget(struct tcb *tcp)
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 @@ int sys_shmat(struct tcb *tcp)
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 @@ sys_mq_open(struct tcb *tcp)
/* 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,