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

nobody is using the return value of rb_io_fptr_finalize

Browse Source 
However this function is listed in ruby/io.h.  We cannot but
define a new, void-returning variant to use instead.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2018-05-04 15:03:37 +00:00
parent b4d935455f
commit b121cfde5f
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal.h
View File

@ -1348,6 +1348,8 @@ VALUE rb_io_flush_raw(VALUE, int);
size_t rb_io_memsize(const rb_io_t *); size_t rb_io_memsize(const rb_io_t *);
#endif #endif
int rb_stderr_tty_p(void); int rb_stderr_tty_p(void);
void rb_io_fptr_finalize_internal(void *ptr);
#define rb_io_fptr_finalize rb_io_fptr_finalize_internal
/* load.c */ /* load.c */
VALUE rb_get_load_path(void); VALUE rb_get_load_path(void);

23
io.c
View File

@ -4629,10 +4629,12 @@ clear_codeconv(rb_io_t *fptr)
clear_writeconv(fptr); clear_writeconv(fptr);
} }
int void
rb_io_fptr_finalize(rb_io_t *fptr) rb_io_fptr_finalize_internal(void *ptr)
{ {
if (!fptr) return 0; rb_io_t *fptr = ptr;
if (!ptr) return;
fptr->pathv = Qnil; fptr->pathv = Qnil;
if (0 <= fptr->fd) if (0 <= fptr->fd)
rb_io_fptr_cleanup(fptr, TRUE); rb_io_fptr_cleanup(fptr, TRUE);
@ -4641,9 +4643,22 @@ rb_io_fptr_finalize(rb_io_t *fptr)
free_io_buffer(&fptr->wbuf); free_io_buffer(&fptr->wbuf);
clear_codeconv(fptr); clear_codeconv(fptr);
free(fptr); free(fptr);
return 1;
} }
#undef rb_io_fptr_finalize
int
rb_io_fptr_finalize(rb_io_t *fptr)
{
if (!fptr) {
return 0;
}
else {
rb_io_fptr_finalize_internal(fptr);
return 1;
}
}
#define rb_io_fptr_finalize(fptr) rb_io_fptr_finalize_internal(fptr)
RUBY_FUNC_EXPORTED size_t RUBY_FUNC_EXPORTED size_t
rb_io_memsize(const rb_io_t *fptr) rb_io_memsize(const rb_io_t *fptr)
{ {