From 3edaf669ba25bcceebb8e4d6d3b2f9e338b35b94 Mon Sep 17 00:00:00 2001 From: ko1 Date: Sun, 8 Jun 2008 10:01:40 +0000 Subject: * array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c, enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c, io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c, string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c, vm.c, gc.c: allocated memory objects by xmalloc (ruby_xmalloc) should be freed by xfree (ruby_xfree). * ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c, ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c, ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c, ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c, ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'thread.c') diff --git a/thread.c b/thread.c index 87535c222..298d1c1dd 100644 --- a/thread.c +++ b/thread.c @@ -1712,7 +1712,7 @@ rb_fd_init(volatile rb_fdset_t *fds) void rb_fd_term(rb_fdset_t *fds) { - if (fds->fdset) free(fds->fdset); + if (fds->fdset) xfree(fds->fdset); fds->maxfd = 0; fds->fdset = 0; } @@ -2129,7 +2129,7 @@ thgroup_s_alloc(VALUE klass) VALUE group; struct thgroup *data; - group = Data_Make_Struct(klass, struct thgroup, 0, free, data); + group = Data_Make_Struct(klass, struct thgroup, 0, -1, data); data->enclosed = 0; data->group = group; @@ -2668,8 +2668,7 @@ barrier_alloc(VALUE klass) VALUE volatile obj; rb_barrier_t *barrier; - obj = Data_Make_Struct(klass, rb_barrier_t, - barrier_mark, barrier_free, barrier); + obj = Data_Make_Struct(klass, rb_barrier_t, barrier_mark, barrier_free, barrier); barrier->owner = GET_THREAD(); barrier->waiting = 0; barrier->tail = &barrier->waiting; -- cgit