naruse	2012-09-15 01:07:49 +0900 (Sat, 15 Sep 2012)

  New Revision: 36966

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36966

  Log:
    * ext/nkf/nkf.c (rb_nkf_convert): suppress warning.

  Modified files:
    trunk/ChangeLog
    trunk/ext/nkf/nkf.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36965)
+++ ChangeLog	(revision 36966)
@@ -1,3 +1,7 @@
+Sat Sep 15 00:20:04 2012  NARUSE, Yui  <naruse@r...>
+
+	* ext/nkf/nkf.c (rb_nkf_convert): suppress warning.
+
 Fri Sep 14 04:05:00 2012  Zachary Scott  <zzak@r...>
 
 	* array.c (rb_ary_diff, rb_ary_uniq):
Index: ext/nkf/nkf.c
===================================================================
--- ext/nkf/nkf.c	(revision 36965)
+++ ext/nkf/nkf.c	(revision 36966)
@@ -135,7 +135,7 @@
 static VALUE
 rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
 {
-    volatile VALUE tmp;
+    VALUE tmp;
     reinit();
     StringValue(opt);
     nkf_split_options(RSTRING_PTR(opt));
@@ -156,23 +156,28 @@
     StringValue(src);
     input = (unsigned char *)RSTRING_PTR(src);
     i_len = RSTRING_LENINT(src);
-    tmp = result = rb_str_new(0, i_len*3 + 10);
+    tmp = rb_str_new(0, i_len*3 + 10);
 
     output_ctr = 0;
-    output     = (unsigned char *)RSTRING_PTR(result);
-    o_len      = RSTRING_LENINT(result);
+    output     = (unsigned char *)RSTRING_PTR(tmp);
+    o_len      = RSTRING_LENINT(tmp);
     *output    = '\0';
 
+    /* use _result_ begin*/
+    result = tmp;
     kanji_convert(NULL);
-    rb_str_set_len(result, output_ctr);
-    OBJ_INFECT(result, src);
+    result = Qnil;
+    /* use _result_ end */
 
+    rb_str_set_len(tmp, output_ctr);
+    OBJ_INFECT(tmp, src);
+
     if (mimeout_f)
-	rb_enc_associate(result, rb_usascii_encoding());
+	rb_enc_associate(tmp, rb_usascii_encoding());
     else
-	rb_enc_associate(result, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
+	rb_enc_associate(tmp, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
 
-    return result;
+    return tmp;
 }
 
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/