From 52d12453a9941ff91fbcaf1b02914efcb5a7621b Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 4 Oct 1999 04:51:08 +0000
Subject: 19991004

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 variable.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'variable.c')

diff --git a/variable.c b/variable.c
index 23ae94587..7b273933a 100644
--- a/variable.c
+++ b/variable.c
@@ -916,7 +916,7 @@ VALUE
 rb_obj_instance_variables(obj)
     VALUE obj;
 {
-    VALUE ary;
+    VALUE ary = rb_ary_new();
 
     if (!FL_TEST(obj, FL_TAINT) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: can't get metainfo");
@@ -924,24 +924,22 @@ rb_obj_instance_variables(obj)
       case T_OBJECT:
       case T_CLASS:
       case T_MODULE:
-	ary = rb_ary_new();
 	if (ROBJECT(obj)->iv_tbl) {
 	    st_foreach(ROBJECT(obj)->iv_tbl, ivar_i, ary);
 	}
-	return ary;
+	break;
       default:
-	if (!generic_iv_tbl) return Qnil;
+	if (!generic_iv_tbl) break;
 	if (FL_TEST(obj, FL_EXIVAR) || rb_special_const_p(obj)) {
 	    st_table *tbl;
 
 	    if (st_lookup(generic_iv_tbl, obj, &tbl)) {
-		ary = rb_ary_new();
 		st_foreach(tbl, ivar_i, ary);
-		return ary;
 	    }
 	}
+	break;
     }
-    return Qnil;
+    return ary;
 }
 
 VALUE
-- 
cgit