]> granicus.if.org Git - strace/commitdiff
ioctl: prepare ioctl_decode_command_number for future changes
authorDmitry V. Levin <ldv@altlinux.org>
Thu, 2 Jul 2015 22:31:11 +0000 (22:31 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Thu, 2 Jul 2015 22:32:27 +0000 (22:32 +0000)
* ioctl.c (ioctl_decode_command_number): Change 1st arg to struct tcb*.
(sys_ioctl): Update callers.

ioctl.c

diff --git a/ioctl.c b/ioctl.c
index 305d27d36da55ed75b2b239d9d2e64839a5be942..d10e45d294cc53cf491d75564566eceb86df9923 100644 (file)
--- a/ioctl.c
+++ b/ioctl.c
@@ -182,8 +182,10 @@ hiddev_decode_number(const unsigned int code)
 }
 
 static int
-ioctl_decode_command_number(const unsigned int code)
+ioctl_decode_command_number(struct tcb *tcp)
 {
+       const unsigned int code = tcp->u_arg[1];
+
        switch (_IOC_TYPE(code)) {
                case 'E':
                        return evdev_decode_number(code);
@@ -274,7 +276,7 @@ SYS_FUNC(ioctl)
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
-               if (!ioctl_decode_command_number(tcp->u_arg[1])) {
+               if (!ioctl_decode_command_number(tcp)) {
                        iop = ioctl_lookup(tcp->u_arg[1]);
                        if (iop) {
                                tprints(iop->symbol);