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

scsi.c: use print_array function

Browse Source 
* scsi.c (print_uchar): New function.
(print_sg_io_buffer): Use it via print_array.
This commit is contained in:
Дмитрий Левин 2016-05-07 23:10:50 +00:00
parent fd2d6a7f52
commit 48b06a63e8
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scsi.c
View File

@ -42,29 +42,21 @@
# include "xlat/bsg_subprotocol.h"
# endif
static void
print_sg_io_buffer(struct tcb *tcp, unsigned long addr, const unsigned int len)
static bool
print_uchar(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
{
unsigned char *buf = NULL;
unsigned int allocated, i;
tprintf("%02x", (unsigned int) (* (unsigned char *) elem_buf));
tprints("[");
if (len == 0)
goto out;
allocated = (len > max_strlen) ? max_strlen : len;
buf = malloc(allocated);
if (!buf || umoven(tcp, addr, allocated, buf) < 0) {
printaddr(addr);
goto out;
}
tprintf("%02x", buf[0]);
for (i = 1; i < allocated; ++i)
tprintf(", %02x", buf[i]);
if (allocated != len)
tprints(", ...");
out:
free(buf);
tprints("]");
return true;
}
static void
print_sg_io_buffer(struct tcb *tcp, const unsigned long addr, const unsigned int len)
{
unsigned char buf;
print_array(tcp, addr, len, &buf, sizeof(buf),
umoven_or_printaddr, print_uchar, 0);
}
static int