kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (do_ioctl, ioctl_narg_len, setup_narg, rb_ioctl): use

Browse source 
ioctl_req_t.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-11-12 08:26:13 +00:00
parent 521f420a77
commit 80c32b2330
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Nov 12 17:26:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (do_ioctl, ioctl_narg_len, setup_narg, rb_ioctl): use
ioctl_req_t.
Sat Nov 12 17:01:49 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/dbm/extconf.rb (headers.db_check): reduce duplicated code.

10
io.c
View file

@ -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;