1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

file.c: fix 64-bit conversion warnings from r60844

Browse Source 
* file.c (nogvl_truncate): cast int to VALUE before "void *"
  (rb_file_s_truncate): cast "void *" to VALUE before int

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2017-11-19 05:03:22 +00:00
parent 6b58fd54d8
commit 3152d68bf3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
file.c
View File

@ -4652,7 +4652,7 @@ nogvl_truncate(void *ptr)
{ {
struct truncate_arg *ta = ptr; struct truncate_arg *ta = ptr;
#ifdef HAVE_TRUNCATE #ifdef HAVE_TRUNCATE
return (void *)truncate(ta->path, ta->pos); return (void *)(VALUE)truncate(ta->path, ta->pos);
#else /* defined(HAVE_CHSIZE) */ #else /* defined(HAVE_CHSIZE) */
{ {
int tmpfd = rb_cloexec_open(ta->path, 0, 0); int tmpfd = rb_cloexec_open(ta->path, 0, 0);
@ -4698,7 +4698,8 @@ rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
path = rb_str_encode_ospath(path); path = rb_str_encode_ospath(path);
ta.path = StringValueCStr(path); ta.path = StringValueCStr(path);
r = (int)rb_thread_call_without_gvl(nogvl_truncate, &ta, RUBY_UBF_IO, NULL); r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_truncate, &ta,
RUBY_UBF_IO, NULL);
if (r < 0) if (r < 0)
rb_sys_fail_path(path); rb_sys_fail_path(path);
return INT2FIX(0); return INT2FIX(0);