Skip to content

Tidy up rb_io_fptr_finalize. #13136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ioquatix merged 1 commit into from
Apr 19, 2025
Merged

Tidy up rb_io_fptr_finalize. #13136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Tidy up rb_io_fptr_finalize.
  • Loading branch information
@ioquatix
ioquatix committed Apr 19, 2025
commit bea28086c57f68b4e0b7e278da7472e8bfef9c87
2 changes: 2 additions & 0 deletions internal/io.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ VALUE rb_io_prep_stdin(void);
VALUE rb_io_prep_stdout(void);
VALUE rb_io_prep_stderr(void);

int rb_io_fptr_finalize(struct rb_io *fptr);

RUBY_SYMBOL_EXPORT_BEGIN
/* io.c (export) */
void rb_maygvl_fd_fix_cloexec(int fd);
Expand Down
24 changes: 6 additions & 18 deletions io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5674,27 +5674,15 @@ rb_io_fptr_cleanup_all(rb_io_t *fptr)
clear_codeconv(fptr);
}

void
rb_io_fptr_finalize_internal(void *ptr)
{
if (!ptr) return;
rb_io_fptr_cleanup_all(ptr);
free(ptr);
}

#undef rb_io_fptr_finalize
int
rb_io_fptr_finalize(rb_io_t *fptr)
rb_io_fptr_finalize(struct rb_io *io)
{
if (!fptr) {
return 0;
}
else {
rb_io_fptr_finalize_internal(fptr);
return 1;
}
if (!io) return 0;
rb_io_fptr_cleanup_all(io);
free(io);

return 1;
}
#define rb_io_fptr_finalize(fptr) rb_io_fptr_finalize_internal(fptr)

size_t
rb_io_memsize(const rb_io_t *fptr)
Expand Down
Loading