diff options
| author | Paul Osborne <osbpau@gmail.com> | 2015-08-14 02:35:49 -0500 |
|---|---|---|
| committer | Paul Osborne <osbpau@gmail.com> | 2015-08-14 02:35:49 -0500 |
| commit | e9d9a328042b4a247715790a4141a8addf28ddb8 (patch) | |
| tree | 36270133279fb977f4a6b21927423ca9649bc8c9 /src/sys | |
| parent | 27298575358ecda4c2887d17aae5c25809f3c4e0 (diff) | |
| download | nix-e9d9a328042b4a247715790a4141a8addf28ddb8.zip | |
ioctl: fix bugs with op generation for writes
These had ior! rather than iow! previously. ior! is obviously
not correct for write operations.
Diffstat (limited to 'src/sys')
| -rw-r--r-- | src/sys/ioctl/platform/linux.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sys/ioctl/platform/linux.rs b/src/sys/ioctl/platform/linux.rs index 1971e8fe..71b63d3a 100644 --- a/src/sys/ioctl/platform/linux.rs +++ b/src/sys/ioctl/platform/linux.rs @@ -131,7 +131,7 @@ macro_rules! ioctl { unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int, val: *const $ty) -> $crate::Result<$crate::sys::ioctl::libc::c_int> { - convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, ior!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::libc::c_ulong, val)) + convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, iow!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::libc::c_ulong, val)) } ); (readwrite $name:ident with $ioty:expr, $nr:expr; $ty:ty) => ( @@ -153,7 +153,7 @@ macro_rules! ioctl { unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int, val: *const $ty, len: usize) -> $crate::Result<$crate::sys::ioctl::libc::c_int> { - convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, ior!($ioty, $nr, len) as $crate::sys::ioctl::libc::c_ulong, val)) + convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, iow!($ioty, $nr, len) as $crate::sys::ioctl::libc::c_ulong, val)) } ); (readwrite buf $name:ident with $ioty:expr, $nr:expr; $ty:ty) => ( |