summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-12 08:26:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-12 08:26:13 +0000
commit80c32b2330a2d25111b54982f942f23641463ce3 (patch)
tree3b94a77ecb01e60f8e3756e0bb3549db09ff8562 /io.c
parent521f420a772c37cd4a90b51da7c18c18084c47ac (diff)
* io.c (do_ioctl, ioctl_narg_len, setup_narg, rb_ioctl): use
ioctl_req_t. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/io.c b/io.c
index 9b73543d5d..a184c7bbfb 100644
--- a/io.c
+++ b/io.c
@@ -7882,7 +7882,7 @@ static VALUE nogvl_ioctl(void *ptr)
}
static int
-do_ioctl(int fd, int cmd, long narg)
+do_ioctl(int fd, ioctl_req_t cmd, long narg)
{
int retval;
struct ioctl_arg arg;
@@ -7897,7 +7897,7 @@ do_ioctl(int fd, int cmd, long narg)
}
static long
-ioctl_narg_len(int cmd)
+ioctl_narg_len(ioctl_req_t cmd)
{
long len;
@@ -8053,7 +8053,7 @@ fcntl_narg_len(int cmd)
#endif /* HAVE_FCNTL */
static long
-setup_narg(int cmd, VALUE *argp, int io_p)
+setup_narg(ioctl_req_t cmd, VALUE *argp, int io_p)
{
long narg = 0;
VALUE arg = *argp;
@@ -8080,7 +8080,7 @@ setup_narg(int cmd, VALUE *argp, int io_p)
if (io_p)
len = ioctl_narg_len(cmd);
else
- len = fcntl_narg_len(cmd);
+ len = fcntl_narg_len((int)cmd);
rb_str_modify(arg);
/* expand for data + sentinel. */
@@ -8099,7 +8099,7 @@ setup_narg(int cmd, VALUE *argp, int io_p)
static VALUE
rb_ioctl(VALUE io, VALUE req, VALUE arg)
{
- int cmd = NUM2IOCTLREQ(req);
+ ioctl_req_t cmd = NUM2IOCTLREQ(req);
rb_io_t *fptr;
long narg;
int retval;