Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
d64c4d64
Commit
d64c4d64
authored
May 11, 2020
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make `off_t` handling simpler; #4872 #4939
The newer `clang` warns implicit float conversions.
parent
846af371
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
39 deletions
+4
-39
mrbgems/mruby-io/src/file.c
mrbgems/mruby-io/src/file.c
+3
-23
mrbgems/mruby-io/src/io.c
mrbgems/mruby-io/src/io.c
+1
-16
No files found.
mrbgems/mruby-io/src/file.c
View file @
d64c4d64
...
...
@@ -458,7 +458,7 @@ mrb_file_size(mrb_state *mrb, mrb_value self)
}
static
int
mrb_ftruncate
(
int
fd
,
int64_
t
length
)
mrb_ftruncate
(
int
fd
,
mrb_in
t
length
)
{
#ifndef _WIN32
return
ftruncate
(
fd
,
(
off_t
)
length
);
...
...
@@ -491,32 +491,12 @@ static mrb_value
mrb_file_truncate
(
mrb_state
*
mrb
,
mrb_value
self
)
{
int
fd
;
int64_
t
length
;
mrb_in
t
length
;
mrb_value
lenv
;
fd
=
mrb_io_fileno
(
mrb
,
self
);
mrb_get_args
(
mrb
,
"o"
,
&
lenv
);
switch
(
mrb_type
(
lenv
))
{
#ifndef MRB_WITHOUT_FLOAT
case
MRB_TT_FLOAT
:
{
mrb_float
lenf
=
mrb_float
(
lenv
);
if
(
lenf
>
INT64_MAX
)
{
mrb_raise
(
mrb
,
E_ARGUMENT_ERROR
,
"length too large"
);
}
length
=
(
int64_t
)
lenf
;
}
break
;
#endif
case
MRB_TT_FIXNUM
:
default:
{
mrb_int
leni
=
mrb_int
(
mrb
,
lenv
);
length
=
(
int64_t
)
leni
;
}
break
;
}
length
=
mrb_int
(
mrb
,
lenv
);
if
(
mrb_ftruncate
(
fd
,
length
)
!=
0
)
{
mrb_raise
(
mrb
,
E_IO_ERROR
,
"ftruncate failed"
);
}
...
...
mrbgems/mruby-io/src/io.c
View file @
d64c4d64
...
...
@@ -1404,22 +1404,7 @@ mrb_io_sync(mrb_state *mrb, mrb_value self)
static
off_t
value2off
(
mrb_state
*
mrb
,
mrb_value
offv
)
{
switch
(
mrb_type
(
offv
))
{
#ifndef MRB_WITHOUT_FLOAT
case
MRB_TT_FLOAT
:
{
mrb_float
tmp
=
mrb_float
(
offv
);
if
(
tmp
<
INT64_MIN
||
tmp
>
INT64_MAX
)
{
/* fall through to use convert by `mrb_int()` (and raise error if out of range) */
}
else
{
return
(
off_t
)
tmp
;
}
}
/* fall through */
#endif
/* MRB_WITHOUT_FLOAT */
default:
return
(
off_t
)
mrb_int
(
mrb
,
offv
);
}
return
(
off_t
)
mrb_int
(
mrb
,
offv
);
}
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment