summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-18 10:00:18 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-18 10:00:18 +0000
commit158e1367e5dfc5a675c93cdad8a0c2a0224eaa2d (patch)
tree666f4fec5093a6693fb7c821e4081f50ac6cdbc6
parent892318561ab39f3ca774334922327f068c0f0014 (diff)
* ext/syck/rubyext.c (syck_genericresolver_node_import): should
not set instance variable "@kind" before initializing it. [ruby-dev:32677] * ext/syck/rubyext.c (syck_resolver_initialize, syck_resolver_detect_implicit, syck_emitter_emit): remove unused variables. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog10
-rw-r--r--ext/syck/rubyext.c7
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 00928784e0..b1b82a924c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Apr 18 18:56:57 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/syck/rubyext.c (syck_genericresolver_node_import): should
+ not set instance variable "@kind" before initializing it.
+ [ruby-dev:32677]
+
+ * ext/syck/rubyext.c (syck_resolver_initialize,
+ syck_resolver_detect_implicit, syck_emitter_emit): remove unused
+ variables.
+
Fri Apr 18 18:54:57 2008 Akinori MUSHA <knu@iDaemons.org>
* ext/syck/rubyext.c: Node#value defined twice.
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
index 5cd64b2df4..76e8279601 100644
--- a/ext/syck/rubyext.c
+++ b/ext/syck/rubyext.c
@@ -917,7 +917,6 @@ static VALUE
syck_resolver_initialize( self )
VALUE self;
{
- VALUE tags = rb_hash_new();
rb_ivar_set(self, s_tags, rb_hash_new());
return self;
}
@@ -952,7 +951,6 @@ VALUE
syck_resolver_detect_implicit( self, val )
VALUE self, val;
{
- char *type_id;
return rb_str_new2( "" );
}
@@ -1308,7 +1306,6 @@ syck_genericresolver_node_import( self, node )
break;
case syck_seq_kind:
- rb_iv_set(obj, "@kind", sym_seq);
v = rb_ary_new2( syck_seq_count( n ) );
for ( i = 0; i < syck_seq_count( n ); i++ )
{
@@ -1319,10 +1316,10 @@ syck_genericresolver_node_import( self, node )
style = sym_inline;
}
obj = rb_funcall( cSeq, s_new, 3, t, v, style );
+ rb_iv_set(obj, "@kind", sym_seq);
break;
case syck_map_kind:
- rb_iv_set(obj, "@kind", sym_map);
v = rb_hash_new();
for ( i = 0; i < syck_map_count( n ); i++ )
{
@@ -1333,6 +1330,7 @@ syck_genericresolver_node_import( self, node )
style = sym_inline;
}
obj = rb_funcall( cMap, s_new, 3, t, v, style );
+ rb_iv_set(obj, "@kind", sym_map);
break;
}
@@ -2028,7 +2026,6 @@ syck_emitter_emit( argc, argv, self )
VALUE self;
{
VALUE oid, proc;
- char *anchor_name;
SyckEmitter *emitter;
struct emitter_xtra *bonus;
SYMID symple;