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

ipc_sem.c: use print_array function

Browse Source 
* ipc_sem.c (tprint_sembuf): Rename to print_sembuf, change signature
for use as print_array callback.
(tprint_sembuf_array): Use print_array.
This commit is contained in:
Дмитрий Левин 2016-05-07 22:56:59 +00:00
parent 4ce3054340
commit 0bae8001da
1 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ipc_sem.c
View File

@ -43,12 +43,16 @@
#include "xlat/semop_flags.h"
#if defined HAVE_SYS_SEM_H || defined HAVE_LINUX_SEM_H
static void
tprint_sembuf(const struct sembuf *sb)
static bool
print_sembuf(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
{
const struct sembuf *sb = elem_buf;
tprintf("{%u, %d, ", sb->sem_num, sb->sem_op);
printflags(semop_flags, sb->sem_flg, "SEM_???");
tprints("}");
return true;
}
#endif
@ -56,35 +60,9 @@ static void
tprint_sembuf_array(struct tcb *tcp, const long addr, const unsigned long count)
{
#if defined HAVE_SYS_SEM_H || defined HAVE_LINUX_SEM_H
unsigned long max_count;
struct sembuf sb;
if (abbrev(tcp))
max_count = (max_strlen < count) ? max_strlen : count;
else
max_count = count;
if (!max_count)
printaddr(addr);
else if (!umove_or_printaddr(tcp, addr, &sb)) {
unsigned long i;
tprints("[");
tprint_sembuf(&sb);
for (i = 1; i < max_count; ++i) {
tprints(", ");
if (umove_or_printaddr(tcp, addr + i * sizeof(sb), &sb))
break;
else
tprint_sembuf(&sb);
}
if (i < max_count || max_count < count)
tprints(", ...");
tprints("]");
}
print_array(tcp, addr, count, &sb, sizeof(sb),
umoven_or_printaddr, print_sembuf, 0);
#else
printaddr(addr);
#endif