]> granicus.if.org Git - strace/commitdiff
v4l2: cast pointers to kernel_ureg_t instead of unsigned long
authorDmitry V. Levin <ldv@altlinux.org>
Sun, 25 Dec 2016 02:14:49 +0000 (02:14 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Sun, 25 Dec 2016 02:19:17 +0000 (02:19 +0000)
* v4l2.c (print_v4l2_buffer): Remove redundant cast.
(print_v4l2_framebuffer): Cast v4l2_framebuffer.base pointer
to kernel_ureg_t instead of unsigned long.
(print_v4l2_ext_controls): Cast v4l2_ext_controls.controls pointer
to kernel_ureg_t instead of unsigned long.

v4l2.c

diff --git a/v4l2.c b/v4l2.c
index ab50c18902aae720fdf5fd4aebc8a735c9c0729f..78226e4aea315b85ab389a8d76e40ce044a4c8d6 100644 (file)
--- a/v4l2.c
+++ b/v4l2.c
@@ -360,7 +360,7 @@ print_v4l2_buffer(struct tcb *tcp, const unsigned int code, const long arg)
                                tprintf(", m.offset=%#x", b.m.offset);
                        } else if (b.memory == V4L2_MEMORY_USERPTR) {
                                tprints(", m.userptr=");
-                               printaddr((unsigned long) b.m.userptr);
+                               printaddr(b.m.userptr);
                        }
 
                        tprintf(", length=%u, bytesused=%u, flags=",
@@ -386,7 +386,7 @@ print_v4l2_framebuffer(struct tcb *tcp, const long arg)
        if (!umove_or_printaddr(tcp, arg, &b)) {
                tprintf("{capability=%#x, flags=%#x, base=",
                        b.capability, b.flags);
-               printaddr((unsigned long) b.base);
+               printaddr((kernel_ureg_t) b.base);
                tprints("}");
        }
 
@@ -704,7 +704,7 @@ print_v4l2_ext_controls(struct tcb *tcp, const long arg, const bool is_get)
 
        tprints("controls=");
        struct_v4l2_ext_control ctrl;
-       bool fail = !print_array(tcp, (unsigned long) c.controls, c.count,
+       bool fail = !print_array(tcp, (kernel_ureg_t) c.controls, c.count,
                                 &ctrl, sizeof(ctrl),
                                 umoven_or_printaddr_ignore_syserror,
                                 print_v4l2_ext_control, 0);