From 7dc66370cbce78e6f616cf19a88c419356548d48 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 18 Mar 2002 08:21:40 +0000 Subject: [PATCH] * eval.c (rb_f_abort): should not bypass cleanup. * ext/stringio/stringio.c (check_modifiable): void function. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ eval.c | 2 +- ext/stringio/stringio.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b25c195b62..ffe110ac84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Mar 18 17:18:06 2002 Nobuyoshi Nakada + + * eval.c (rb_f_abort): should not bypass cleanup. + + * ext/stringio/stringio.c (check_modifiable): void function. + Mon Mar 18 12:52:01 2002 WATANABE Hirofumi * ext/iconv/extconf.rb: workaround for GNU libiconv. diff --git a/eval.c b/eval.c index 5a18ee3b3a..e2166b862d 100644 --- a/eval.c +++ b/eval.c @@ -3504,7 +3504,7 @@ rb_f_abort(argc, argv) rb_scan_args(argc, argv, "01", &mesg); rb_io_puts(argc, argv, rb_stderr); - exit(1); + rb_exit(1); } return Qnil; /* not reached */ } diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 25122dd1b5..14611a77f7 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -32,6 +32,7 @@ static struct StringIO* check_strio _((VALUE)); static struct StringIO* get_strio _((VALUE)); static struct StringIO* readable _((struct StringIO *)); static struct StringIO* writable _((struct StringIO *)); +static struct void check_modifiable _((struct StringIO *)); #define IS_STRIO(obj) (RDATA(obj)->dmark == (RUBY_DATA_FUNC)strio_mark) #define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg)) @@ -117,7 +118,7 @@ writable(ptr) return ptr; } -static struct StringIO* +static struct void check_modifiable(ptr) struct StringIO *ptr; {