| author |  Luna <git@l4.pm> 2020-04-20 18:03:54-03:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2020-06-02 14:56:19-04:00 |
| log | 6623efd7d4ae3f71f7da4c8aa9975291c1d89303 |
| tree | 767d7f0d7ce18b5968d2ed0978e1629f1b19f108 |
| parent | 6d3d1152eafea83efcde066d494edd9adc65a02d |
Change ioctl's request type to i32
2 files changed, 3 insertions(+), 3 deletions(-)
lib/std/os.zig+1-1
| ... | @@ -4905,7 +4905,7 @@ pub fn tcsetattr(handle: fd_t, optional_action: TCSA, termios_p: termios) Termio | ... | @@ -4905,7 +4905,7 @@ pub fn tcsetattr(handle: fd_t, optional_action: TCSA, termios_p: termios) Termio |
| 4905 | } | 4905 | } |
| 4906 | } | 4906 | } |
| 4907 | 4907 | ||
| 4908 | pub fn ioctl(handle: fd_t, request: u32, arg: var) !void { | 4908 | pub fn ioctl(handle: fd_t, request: i32, arg: var) !void { |
| 4909 | switch (errno(system.ioctl(handle, request, arg))) { | 4909 | switch (errno(system.ioctl(handle, request, arg))) { |
| 4910 | 0 => {}, | 4910 | 0 => {}, |
| 4911 | EINVAL => unreachable, | 4911 | EINVAL => unreachable, |
lib/std/os/linux.zig+2-2
| ... | @@ -1193,8 +1193,8 @@ pub fn tcsetattr(fd: fd_t, optional_action: TCSA, termios_p: *const termios) usi | ... | @@ -1193,8 +1193,8 @@ pub fn tcsetattr(fd: fd_t, optional_action: TCSA, termios_p: *const termios) usi |
| 1193 | return ioctl(fd, TCSETS + @enumToInt(optional_action), @ptrToInt(termios_p)); | 1193 | return ioctl(fd, TCSETS + @enumToInt(optional_action), @ptrToInt(termios_p)); |
| 1194 | } | 1194 | } |
| 1195 | 1195 | ||
| 1196 | pub fn ioctl(fd: fd_t, request: u32, arg: var) usize { | 1196 | pub fn ioctl(fd: fd_t, request: i32, arg: var) usize { |
| 1197 | return syscall3(.ioctl, @bitCast(usize, @as(isize, fd)), request, arg); | 1197 | return syscall3(.ioctl, @bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, request)), arg); |
| 1198 | } | 1198 | } |
| 1199 | 1199 | ||
| 1200 | test "" { | 1200 | test "" { |