diff options
| author | Eugene Syromyatnikov <evgsyr@gmail.com> | 2020-02-27 01:21:09 +0100 |
|---|---|---|
| committer | Eugene Syromyatnikov <evgsyr@gmail.com> | 2020-03-23 13:32:14 +0100 |
| commit | 1bc450e8db10da20f90907cd49c037eb9247c36f (patch) | |
| tree | 3c7e95c31aa23937c8383d41c978d3f611ff5e8d | |
| parent | 98bc7dd41475c12d9479c4f5267c0d663793419f (diff) | |
| download | strace-1bc450e8db10da20f90907cd49c037eb9247c36f.tar.gz | |
v4l2: move io_size printing after service_lines
In order to follow field declaration order.
* v4l2.c (print_v4l2_format_fmt) <case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE,
case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT>: Print io_size field
of struct v4l2_sliced_vbi_format after service_lines.
* tests/ioctl_v4l2-success.c (print_fmt): Update expected output.
* tests/ioctl_v4l2.c (dprint_ioctl_v4l2): Likewise.
| -rw-r--r-- | tests/ioctl_v4l2-success.c | 18 | ||||
| -rw-r--r-- | tests/ioctl_v4l2.c | 8 | ||||
| -rw-r--r-- | v4l2.c | 6 |
3 files changed, 16 insertions, 16 deletions
diff --git a/tests/ioctl_v4l2-success.c b/tests/ioctl_v4l2-success.c index 13c5e34b3..ad977662e 100644 --- a/tests/ioctl_v4l2-success.c +++ b/tests/ioctl_v4l2-success.c @@ -289,15 +289,15 @@ print_fmt(const char *pfx, struct v4l2_format *f) printf("%sfmt.sliced={service_set=" XLAT_KNOWN(0xfeed, "V4L2_SLICED_VBI_625" "|V4L2_SLICED_CAPTION_525|0xaaec") - ", io_size=3740978925, service_lines=[[0xdead, 0xdeac" - ", 0xdeaf, 0xdeae, 0xdea9, 0xdea8, 0xdeab, 0xdeaa" - ", 0xdea5, 0xdea4, 0xdea7, 0xdea6, 0xdea1, 0xdea0" - ", 0xdea3, 0xdea2, 0xdebd, 0xdebc, 0xdebf, 0xdebe" - ", 0xdeb9, 0xdeb8, 0xdebb, 0xdeba], [0xdfad, 0xdfac" - ", 0xdfaf, 0xdfae, 0xdfa9, 0xdfa8, 0xdfab, 0xdfaa" - ", 0xdfa5, 0xdfa4, 0xdfa7, 0xdfa6, 0xdfa1, 0xdfa0" - ", 0xdfa3, 0xdfa2, 0xdfbd, 0xdfbc, 0xdfbf, 0xdfbe" - ", 0xdfb9, 0xdfb8, 0xdfbb, 0xdfba]]}", + ", service_lines=[[0xdead, 0xdeac, 0xdeaf, 0xdeae" + ", 0xdea9, 0xdea8, 0xdeab, 0xdeaa, 0xdea5, 0xdea4" + ", 0xdea7, 0xdea6, 0xdea1, 0xdea0, 0xdea3, 0xdea2" + ", 0xdebd, 0xdebc, 0xdebf, 0xdebe, 0xdeb9, 0xdeb8" + ", 0xdebb, 0xdeba], [0xdfad, 0xdfac, 0xdfaf, 0xdfae" + ", 0xdfa9, 0xdfa8, 0xdfab, 0xdfaa, 0xdfa5, 0xdfa4" + ", 0xdfa7, 0xdfa6, 0xdfa1, 0xdfa0, 0xdfa3, 0xdfa2" + ", 0xdfbd, 0xdfbc, 0xdfbf, 0xdfbe, 0xdfb9, 0xdfb8" + ", 0xdfbb, 0xdfba]], io_size=3740978925}", pfx); break; #endif diff --git a/tests/ioctl_v4l2.c b/tests/ioctl_v4l2.c index c2eed707e..b6942e0c1 100644 --- a/tests/ioctl_v4l2.c +++ b/tests/ioctl_v4l2.c @@ -370,11 +370,10 @@ dprint_ioctl_v4l2(struct v4l2_format *const f, saved_errno = errno; printf("ioctl(-1, " XLAT_FMT ", {type=" XLAT_FMT ", fmt.sliced={service_set=" XLAT_FMT - ", io_size=%u, service_lines=[", + ", service_lines=[", XLAT_SEL(reqval, reqstr), XLAT_SEL(buf_type, buf_type_string), - XLAT_ARGS(V4L2_SLICED_VPS), - f->fmt.sliced.io_size); + XLAT_ARGS(V4L2_SLICED_VPS)); for (i = 0; i < ARRAY_SIZE(f->fmt.sliced.service_lines); i++) { @@ -392,7 +391,8 @@ dprint_ioctl_v4l2(struct v4l2_format *const f, printf("]"); } errno = saved_errno; - printf("]}}) = -1 EBADF (%m)\n"); + printf("], io_size=%u}}) = -1 EBADF (%m)\n", + f->fmt.sliced.io_size); break; } #endif @@ -332,15 +332,15 @@ print_v4l2_format_fmt(struct tcb *const tcp, const char *prefix, tprints("fmt.sliced={service_set="); printflags(v4l2_sliced_flags, f->fmt.sliced.service_set, "V4L2_SLICED_???"); - tprintf(", io_size=%u, service_lines=[", - f->fmt.sliced.io_size); + tprints(", service_lines=["); for (i = 0; i < ARRAY_SIZE(f->fmt.sliced.service_lines); i++) { if (i) tprints(", "); print_local_array(tcp, f->fmt.sliced.service_lines[i], print_xint16_array_member); } - tprints("]}"); + PRINT_FIELD_U("], ", f->fmt.sliced, io_size); + tprints("}"); break; } /* since Linux v4.4-rc1~118^2~14 */ |