# include "xlat/bsg_subprotocol.h"
# endif
+static bool
+print_uchar(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
+{
+ tprintf("%02x", (unsigned int) (* (unsigned char *) elem_buf));
+
+ return true;
+}
+
static void
-print_sg_io_buffer(struct tcb *tcp, unsigned long addr, const unsigned int len)
+print_sg_io_buffer(struct tcb *tcp, const unsigned long addr, const unsigned int len)
{
- unsigned char *buf = NULL;
- unsigned int allocated, i;
-
- tprints("[");
- if (len == 0)
- goto out;
- allocated = (len > max_strlen) ? max_strlen : len;
- if ((buf = malloc(allocated)) == NULL ||
- umoven(tcp, addr, allocated, buf) < 0) {
- tprintf("%#lx", 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("]");
+ unsigned char buf;
+
+ print_array(tcp, addr, len, &buf, sizeof(buf),
+ umoven_or_printaddr, print_uchar, 0);
}
static int
tprintf(", data[%u]=", sg_io.dxfer_len);
if (sg_io.iovec_count)
tprint_iov_upto(tcp, sg_io.iovec_count,
- (unsigned long) sg_io.dxferp, 1,
+ (unsigned long) sg_io.dxferp,
+ IOV_DECODE_STR,
sg_io.dxfer_len);
else
print_sg_io_buffer(tcp, (unsigned long) sg_io.dxferp,
tprintf(", data[%u]=", din_len);
if (sg_io.iovec_count)
tprint_iov_upto(tcp, sg_io.iovec_count,
- (unsigned long) sg_io.dxferp, 1,
- din_len);
+ (unsigned long) sg_io.dxferp,
+ syserror(tcp) ? IOV_DECODE_ADDR :
+ IOV_DECODE_STR, din_len);
else
print_sg_io_buffer(tcp, (unsigned long) sg_io.dxferp,
din_len);
printxval(bsg_subprotocol, sg_io.subprotocol, "BSG_SUB_PROTOCOL_???");
tprintf(", request[%u]=", sg_io.request_len);
print_sg_io_buffer(tcp, sg_io.request, sg_io.request_len);
- tprintf(", request_tag=%llu", (unsigned long long) sg_io.request_tag);
+ tprintf(", request_tag=%" PRI__u64, sg_io.request_tag);
tprintf(", request_attr=%u", sg_io.request_attr);
tprintf(", request_priority=%u", sg_io.request_priority);
tprintf(", request_extra=%u", sg_io.request_extra);
tprintf(", din_xfer_len=%u", sg_io.din_xfer_len);
tprintf(", timeout=%u", sg_io.timeout);
tprintf(", flags=%u", sg_io.flags);
- tprintf(", usr_ptr=%llu", (unsigned long long) sg_io.usr_ptr);
+ tprintf(", usr_ptr=%" PRI__u64, sg_io.usr_ptr);
tprintf(", spare_in=%u", sg_io.spare_in);
tprintf(", dout[%u]=", sg_io.dout_xfer_len);
if (sg_io.dout_iovec_count)
tprint_iov_upto(tcp, sg_io.dout_iovec_count, sg_io.dout_xferp,
- 1, sg_io.dout_xfer_len);
+ IOV_DECODE_STR, sg_io.dout_xfer_len);
else
print_sg_io_buffer(tcp, sg_io.dout_xferp, sg_io.dout_xfer_len);
return 1;
tprintf(", din[%u]=", din_len);
if (sg_io.din_iovec_count)
tprint_iov_upto(tcp, sg_io.din_iovec_count, sg_io.din_xferp,
- 1, din_len);
+ syserror(tcp) ? IOV_DECODE_ADDR :
+ IOV_DECODE_STR, din_len);
else
print_sg_io_buffer(tcp, sg_io.din_xferp, din_len);
tprintf(", driver_status=%u", sg_io.driver_status);
tprintf(", response_len=%u", sg_io.response_len);
tprintf(", din_resid=%u", sg_io.din_resid);
tprintf(", dout_resid=%u", sg_io.dout_resid);
- tprintf(", generated_tag=%llu", (unsigned long long) sg_io.generated_tag);
+ tprintf(", generated_tag=%" PRI__u64, sg_io.generated_tag);
tprintf(", spare_out=%u", sg_io.spare_out);
}
else
print_sg_io_res(tcp, iid, arg);
}
- tprintf("}");
+ tprints("}");
return RVAL_DECODED | 1;
}
}