xlat: print _IOC_NONE in symbolic form even if it is equal to 0

On some architectures _IOC_NONE equals to 1, on others it is 0.
Change the way how ioctl direction flags are printed so that
_IOC_NONE is printed in symbolic form even if it is equal to 0.

* xlat/ioctl_dirs.in (_IOC_NONE): Move to the head of the list.
* tests/ioctl_inotify.c (main): Update expected output.
* tests/ioctl_loop. (main): Likewise.c
* tests/ioctl_perf.c (main): Likewise.
* tests/ioctl_scsi.c (main): Likewise.

diff --git a/tests/ioctl_inotify.c b/tests/ioctl_inotify.c
index 0650c624d308c8f69a5230418ba9548d779e8829..27e0a8685fea30b5119c89eb2df147f92cdd67dd 100644 (file)
--- a/tests/ioctl_inotify.c
+++ b/tests/ioctl_inotify.c
@@ -56,10 +56,10 @@ main(void)
 
        /* Unknown inotify commands */
        sys_ioctl(-1, unknown_inotify_cmd, magic);
-       printf("ioctl(-1, _IOC(_IOC_READ|_IOC_WRITE%s, 0x49, %#x, %#x), "
+       printf("ioctl(-1, _IOC(%s_IOC_READ|_IOC_WRITE, 0x49, %#x, %#x), "
               "%#lx) = -1 EBADF (%m)\n",
               _IOC_DIR((unsigned int) unknown_inotify_cmd) & _IOC_NONE ?
-              "|_IOC_NONE" : "",
+              "_IOC_NONE|" : "",
               _IOC_NR((unsigned int) unknown_inotify_cmd),
               _IOC_SIZE((unsigned int) unknown_inotify_cmd),
               (unsigned long) magic);

diff --git a/tests/ioctl_loop.c b/tests/ioctl_loop.c
index 10b7dc348bad5e8304f26f179b2511866587dbe4..06c99ae4eb98eab32e5e2864d929e1132f7cf272 100644 (file)
--- a/tests/ioctl_loop.c
+++ b/tests/ioctl_loop.c
@@ -187,24 +187,26 @@ main(void)
 
        /* Unknown loop commands */
        sys_ioctl(-1, unknown_loop_cmd, magic);
-       printf("ioctl(-1, _IOC(_IOC_READ|_IOC_WRITE%s, 0x4c, %#x, %#x), "
+       printf("ioctl(-1, _IOC(%s_IOC_READ|_IOC_WRITE, 0x4c, %#x, %#x), "
               "%#lx) = -1 EBADF (%m)\n",
               _IOC_DIR((unsigned int) unknown_loop_cmd) & _IOC_NONE ?
-              "|_IOC_NONE" : "",
+              "_IOC_NONE|" : "",
               _IOC_NR((unsigned int) unknown_loop_cmd),
               _IOC_SIZE((unsigned int) unknown_loop_cmd),
               (unsigned long) magic);
 
        sys_ioctl(-1, LOOP_SET_BLOCK_SIZE + 1, magic);
-       printf("ioctl(-1, _IOC(0, 0x4c, %#x, %#x), %#lx) = "
+       printf("ioctl(-1, _IOC(%s, 0x4c, %#x, %#x), %#lx) = "
               "-1 EBADF (%m)\n",
+              _IOC_NONE ? "0" : "_IOC_NONE",
               _IOC_NR(LOOP_SET_BLOCK_SIZE + 1),
               _IOC_SIZE(LOOP_SET_BLOCK_SIZE + 1),
               (unsigned long) magic);
 
        sys_ioctl(-1, LOOP_CTL_GET_FREE + 1, magic);
-       printf("ioctl(-1, _IOC(0, 0x4c, %#x, %#x), %#lx) = "
+       printf("ioctl(-1, _IOC(%s, 0x4c, %#x, %#x), %#lx) = "
               "-1 EBADF (%m)\n",
+              _IOC_NONE ? "0" : "_IOC_NONE",
               _IOC_NR(LOOP_CTL_GET_FREE + 1),
               _IOC_SIZE(LOOP_CTL_GET_FREE + 1),
               (unsigned long) magic);

diff --git a/tests/ioctl_perf.c b/tests/ioctl_perf.c
index 7db01dbc8f2edcab78b9de26bb5a165a1619d730..18f59faf7e6b44636e090658a4e9107a4ec6fe60 100644 (file)
--- a/tests/ioctl_perf.c
+++ b/tests/ioctl_perf.c
@@ -91,10 +91,10 @@ main(void)
 
        /* Unknown perf commands */
        sys_ioctl(-1, unknown_perf_cmd, magic);
-       printf("ioctl(-1, _IOC(_IOC_READ|_IOC_WRITE%s, 0x24, %#x, %#x), "
+       printf("ioctl(-1, _IOC(%s_IOC_READ|_IOC_WRITE, 0x24, %#x, %#x), "
               "%#lx) = -1 EBADF (%m)\n",
               _IOC_DIR((unsigned int) unknown_perf_cmd) & _IOC_NONE ?
-              "|_IOC_NONE" : "",
+              "_IOC_NONE|" : "",
               _IOC_NR((unsigned int) unknown_perf_cmd),
               _IOC_SIZE((unsigned int) unknown_perf_cmd),
               (unsigned long) magic);

diff --git a/tests/ioctl_scsi.c b/tests/ioctl_scsi.c
index a9ecf28832c35e05dfa524be73a435027bad9990..b15c54d9915a10c8c49db22396e278981cf14e98 100644 (file)
--- a/tests/ioctl_scsi.c
+++ b/tests/ioctl_scsi.c
@@ -137,13 +137,14 @@ main(void)
               "SG_SCSI_RESET");
 
        ioctl(-1, 0x22ff, 0);
-       printf("ioctl(-1, _IOC(0, 0x22, 0xff, 0), 0) = -1 EBADF (%m)\n");
+       printf("ioctl(-1, _IOC(%s, 0x22, 0xff, 0), 0) = -1 EBADF (%m)\n",
+              _IOC_NONE ? "0" : "_IOC_NONE");
 
        static const unsigned long magic =
                (unsigned long) 0xdeadbeeffacefeedULL;
        ioctl(-1, 0x22ff, magic);
-       printf("ioctl(-1, _IOC(0, 0x22, 0xff, 0), %#lx) = -1 EBADF (%m)\n",
-              magic);
+       printf("ioctl(-1, _IOC(%s, 0x22, 0xff, 0), %#lx) = -1 EBADF (%m)\n",
+              _IOC_NONE ? "0" : "_IOC_NONE", magic);
 
        puts("+++ exited with 0 +++");
        return 0;

diff --git a/xlat/ioctl_dirs.in b/xlat/ioctl_dirs.in
index 4c97a8692547101267bc386c4b2161fd08ac0219..c069dd7357d7c738ae7128e49e2600baa6a73039 100644 (file)
--- a/xlat/ioctl_dirs.in
+++ b/xlat/ioctl_dirs.in
@@ -1,3 +1,3 @@
+_IOC_NONE
 _IOC_READ
 _IOC_WRITE
-_IOC_NONE