* ext/socket/socket.c (tcp_s_gethostbyname): was using

matz · matz · commit 85911c410a6b · 2003-07-25T05:36:55.000Z
uninitialized size_t value. [ruby-talk:76946]

* Minor cleanups.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 25 14:34:55 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (tcp_s_gethostbyname): was using
+	  uninitialized size_t value. [ruby-talk:76946]
+
 Fri Jul 25 13:38:38 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* re.c (rb_reg_options_m): use rb_reg_options() to mask internal
diff --git a/array.c b/array.c
@@ -1817,7 +1817,7 @@ rb_ary_and(ary1, ary2)
 
     for (i=0; i<RARRAY(ary1)->len; i++) {
 	VALUE v = RARRAY(ary1)->ptr[i];
-	if (st_delete(RHASH(hash)->tbl, &v, 0)) {
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {
 	    rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
 	}
     }
@@ -1839,13 +1839,13 @@ rb_ary_or(ary1, ary2)
 
     for (i=0; i<RARRAY(ary1)->len; i++) {
 	v = RARRAY(ary1)->ptr[i];
-	if (st_delete(RHASH(hash)->tbl, &v, 0)) {
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {
 	    rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
 	}
     }
     for (i=0; i<RARRAY(ary2)->len; i++) {
 	v = RARRAY(ary2)->ptr[i];
-	if (st_delete(RHASH(hash)->tbl, &v, 0)) {
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {
 	    rb_ary_push(ary3, RARRAY(ary2)->ptr[i]);
 	}
     }
@@ -1870,7 +1870,7 @@ rb_ary_uniq_bang(ary)
     end = p + RARRAY(ary)->len;
     while (p < end) {
 	VALUE v = *p;
-	if (st_delete(RHASH(hash)->tbl, &v, 0)) {
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {
 	    *q++ = *p;
 	}
 	p++;
diff --git a/class.c b/class.c
@@ -72,9 +72,9 @@ rb_mod_clone(module)
 
 	RCLASS(clone)->iv_tbl = st_copy(RCLASS(module)->iv_tbl);
 	id = rb_intern("__classpath__");
-	st_delete(RCLASS(clone)->iv_tbl, &id, 0);
+	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
 	id = rb_intern("__classid__");
-	st_delete(RCLASS(clone)->iv_tbl, &id, 0);
+	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
     }
     if (RCLASS(module)->m_tbl) {
 	RCLASS(clone)->m_tbl = st_init_numtable();
diff --git a/dln.c b/dln.c
@@ -675,7 +675,7 @@ load_1(fd, disp, need_init)
 	    char *key = sym->n_un.n_name;
 
 	    if (st_lookup(sym_tbl, sym[1].n_un.n_name, &old_sym)) {
-		if (st_delete(undef_tbl, &key, NULL)) {
+		if (st_delete(undef_tbl, (st_data_t*)&key, NULL)) {
 		    unlink_undef(key, old_sym->n_value);
 		    free(key);
 		}
@@ -688,7 +688,7 @@ load_1(fd, disp, need_init)
 		st_foreach(reloc_tbl, reloc_repl, &data);
 
 		st_insert(undef_tbl, strdup(sym[1].n_un.n_name), NULL);
-		if (st_delete(undef_tbl, &key, NULL)) {
+		if (st_delete(undef_tbl, (st_data_t*)&key, NULL)) {
 		    free(key);
 		}
 	    }
@@ -756,7 +756,7 @@ load_1(fd, disp, need_init)
 	    }
 
 	    key = sym->n_un.n_name;
-	    if (st_delete(undef_tbl, &key, NULL) != 0) {
+	    if (st_delete(undef_tbl, (st_data_t*)&key, NULL) != 0) {
 		unlink_undef(key, sym->n_value);
 		free(key);
 	    }
diff --git a/eval.c b/eval.c
@@ -8206,7 +8206,7 @@ rb_thread_save_context(th)
 }
 
 static int
-thread_switch(n)
+rb_thread_switch(n)
     int n;
 {
     rb_trap_immediate = (curr_thread->flags&0x100)?1:0;
@@ -8239,7 +8239,7 @@ thread_switch(n)
 
 #define THREAD_SAVE_CONTEXT(th) \
     (rb_thread_save_context(th),\
-     thread_switch((FLUSH_REGISTER_WINDOWS, setjmp((th)->context))))
+     rb_thread_switch((FLUSH_REGISTER_WINDOWS, setjmp((th)->context))))
 
 static void rb_thread_restore_context _((rb_thread_t,int));
 
@@ -9137,21 +9137,21 @@ rb_thread_safe_level(thread)
     return INT2NUM(th->safe);
 }
 
-static int thread_abort;
+static int ruby_thread_abort;
 static VALUE thgroup_default;
 
 static VALUE
 rb_thread_s_abort_exc()
 {
-    return thread_abort?Qtrue:Qfalse;
+    return ruby_thread_abort?Qtrue:Qfalse;
 }
 
 static VALUE
 rb_thread_s_abort_exc_set(self, val)
     VALUE self, val;
 {
     rb_secure(4);
-    thread_abort = RTEST(val);
+    ruby_thread_abort = RTEST(val);
     return val;
 }
 
@@ -9380,7 +9380,7 @@ rb_thread_start_0(fn, arg, th_arg)
 		rb_thread_raise(1, &ruby_errinfo, main_thread);
 	    }
 	}
-	else if (th->safe < 4 && (thread_abort || th->abort || RTEST(ruby_debug))) {
+	else if (th->safe < 4 && (ruby_thread_abort || th->abort || RTEST(ruby_debug))) {
 	    VALUE err = system_exit(1, 0, 0);
 	    error_print();
 	    /* exit on main_thread */
@@ -9733,7 +9733,7 @@ rb_thread_local_aset(thread, id, val)
 	th->locals = st_init_numtable();
     }
     if (NIL_P(val)) {
-	st_delete(th->locals, &id, 0);
+	st_delete(th->locals, (st_data_t*)&id, 0);
 	return Qnil;
     }
     st_insert(th->locals, id, val);
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
@@ -1092,7 +1092,6 @@ tcp_s_gethostbyname(obj, host)
     struct hostent *h = sock_hostbyname(host);
     VALUE ary, names;
     char **pch;
-    size_t size;
 
     ary = rb_ary_new();
     rb_ary_push(ary, rb_str_new2(h->h_name));
@@ -1124,7 +1123,7 @@ tcp_s_gethostbyname(obj, host)
 #ifdef SIN6_LEN
 	    sin6.sin6_len = sizeof(sin6);
 #endif
-	    memcpy((char*)&sin6.sin6_addr, *pch, size);
+	    memcpy((char*)&sin6.sin6_addr, *pch, h->h_length);
 	    rb_ary_push(ary, mkipaddr((struct sockaddr*)&sin6));
 	    break;
 	  }
diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c
@@ -192,7 +192,7 @@ syck_emitter_flush( SyckEmitter *e, long check_room )
         {
             char *header = S_ALLOC_N( char, 64 );
             S_MEMZERO( header, char, 64 );
-            sprintf( header, "--- %YAML:%d.%d ", SYCK_YAML_MAJOR, SYCK_YAML_MINOR );
+            sprintf( header, "--- %%YAML:%d.%d ", SYCK_YAML_MAJOR, SYCK_YAML_MINOR );
             (e->handler)( e, header, strlen( header ) );
             S_FREE( header );
         }
diff --git a/file.c b/file.c
@@ -1051,6 +1051,7 @@ rb_file_s_lchmod(argc, argv)
     VALUE *argv;
 {
     rb_notimplement();
+    return Qnil;		/* not reached */
 }
 #endif
 
diff --git a/gc.c b/gc.c
@@ -1459,7 +1459,7 @@ undefine_final(os, obj)
     VALUE os, obj;
 {
     if (finalizer_table) {
-	st_delete(finalizer_table, &obj, 0);
+	st_delete(finalizer_table, (st_data_t*)&obj, 0);
     }
     return obj;
 }
@@ -1533,7 +1533,7 @@ run_final(obj)
 	args[0] = RARRAY(finalizers)->ptr[i];
 	rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
     }
-    if (finalizer_table && st_delete(finalizer_table, &obj, &table)) {
+    if (finalizer_table && st_delete(finalizer_table, (st_data_t*)&obj, &table)) {
 	for (i=0; i<RARRAY(table)->len; i++) {
 	    args[0] = RARRAY(table)->ptr[i];
 	    rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
diff --git a/hash.c b/hash.c
@@ -407,12 +407,12 @@ rb_hash_delete(hash, key)
 
     rb_hash_modify(hash);
     if (RHASH(hash)->iter_lev > 0) {
-	if (st_delete_safe(RHASH(hash)->tbl, &key, &val, Qundef)) {
+	if (st_delete_safe(RHASH(hash)->tbl, (st_data_t*)&key, &val, Qundef)) {
 	    FL_SET(hash, HASH_DELETED);
 	    return val;
 	}
     }
-    else if (st_delete(RHASH(hash)->tbl, &key, &val))
+    else if (st_delete(RHASH(hash)->tbl, (st_data_t*)&key, &val))
 	return val;
     if (rb_block_given_p()) {
 	return rb_yield(key);
diff --git a/lib/mathn.rb b/lib/mathn.rb
@@ -117,7 +117,7 @@ class Rational
   Unify = true
 
   def inspect
-    format "%s/%s", @numerator.inspect, @denominator.inspect
+    format "%s/%s", numerator.inspect, denominator.inspect
   end
 
   alias power! **
@@ -134,8 +134,8 @@ def ** (other)
 	return Rational(1,1)
       end
       
-      npd = @numerator.prime_division
-      dpd = @denominator.prime_division
+      npd = numerator.prime_division
+      dpd = denominator.prime_division
       if other < 0
 	other = -other
 	npd, dpd = dpd, npd
@@ -164,11 +164,11 @@ def ** (other)
       
     elsif other.kind_of?(Integer)
       if other > 0
-	num = @numerator ** other
-	den = @denominator ** other
+	num = numerator ** other
+	den = denominator ** other
       elsif other < 0
-	num = @denominator ** -other
-	den = @numerator ** -other
+	num = denominator ** -other
+	den = numerator ** -other
       elsif other == 0
 	num = 1
 	den = 1
@@ -208,11 +208,11 @@ def power2(other)
       
     elsif other.kind_of?(Integer)
       if other > 0
-	num = @numerator ** other
-	den = @denominator ** other
+	num = numerator ** other
+	den = denominator ** other
       elsif other < 0
-	num = @denominator ** -other
-	den = @numerator ** -other
+	num = denominator ** -other
+	den = numerator ** -other
       elsif other == 0
 	num = 1
 	den = 1
diff --git a/numeric.c b/numeric.c
@@ -11,6 +11,7 @@
 **********************************************************************/
 
 #include "ruby.h"
+#include "env.h"
 #include <math.h>
 #include <stdio.h>
 
@@ -131,15 +132,15 @@ rb_num_coerce_bin(x, y)
     VALUE x, y;
 {
     do_coerce(&x, &y, Qtrue);
-    return rb_funcall(x, rb_frame_last_func(), 1, y);
+    return rb_funcall(x, ruby_frame->orig_func, 1, y);
 }
 
 VALUE
 rb_num_coerce_cmp(x, y)
     VALUE x, y;
 {
     if (do_coerce(&x, &y, Qfalse)) 
-	return rb_funcall(x, rb_frame_last_func(), 1, y);
+	return rb_funcall(x, ruby_frame->orig_func, 1, y);
     return Qnil;
 }
 
@@ -150,7 +151,7 @@ num_coerce_relop(x, y)
     VALUE c, x0 = x, y0 = y;
 
     if (!do_coerce(&x, &y, Qfalse) ||
-	NIL_P(c = rb_funcall(x, rb_frame_last_func(), 1, y))) {
+	NIL_P(c = rb_funcall(x, ruby_frame->orig_func, 1, y))) {
 	rb_cmperr(x0, y0);
 	return Qnil;		/* not reached */
     }
diff --git a/process.c b/process.c
@@ -297,7 +297,7 @@ rb_waitpid(pid, st, flags)
 #else  /* NO_WAITPID */
     if (pid_tbl && st_lookup(pid_tbl, pid, st)) {
 	last_status_set(*st, pid);
-	st_delete(pid_tbl, &pid, NULL);
+	st_delete(pid_tbl, (st_data_t*)&pid, NULL);
 	return pid;
     }
 
@@ -1487,6 +1487,7 @@ p_sys_issetugid(obj)
     }
 #else
     rb_notimplement();
+    return Qnil;		/* not reached */
 #endif
 }
 
diff --git a/variable.c b/variable.c
@@ -155,7 +155,7 @@ classname(klass)
 	    }
 	    path = rb_str_new2(rb_id2name(SYM2ID(path)));
 	    st_insert(ROBJECT(klass)->iv_tbl, classpath, path);
-	    st_delete(RCLASS(klass)->iv_tbl, &classid, 0);
+	    st_delete(RCLASS(klass)->iv_tbl, (st_data_t*)&classid, 0);
 	}
 	if (TYPE(path) != T_STRING) {
 	    rb_bug("class path is not set properly");
@@ -188,7 +188,7 @@ rb_class_path(klass)
 
 	path = find_class_path(klass);
 	if (!NIL_P(path)) {
-	    st_delete(RCLASS(klass)->iv_tbl, &tmppath, 0);
+	    st_delete(RCLASS(klass)->iv_tbl, (st_data_t*)&tmppath, 0);
 	    return path;
 	}
 	if (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl, tmppath, &path)) {
@@ -1085,7 +1085,7 @@ rb_obj_remove_instance_variable(obj, name)
       case T_OBJECT:
       case T_CLASS:
       case T_MODULE:
-	if (ROBJECT(obj)->iv_tbl && st_delete(ROBJECT(obj)->iv_tbl, &id, &val)) {
+	if (ROBJECT(obj)->iv_tbl && st_delete(ROBJECT(obj)->iv_tbl, (st_data_t*)&id, &val)) {
 	    return val;
 	}
 	break;
@@ -1184,17 +1184,17 @@ autoload_delete(mod, id)
 {
     VALUE val, file = Qnil;
 
-    st_delete(RCLASS(mod)->iv_tbl, &id, 0);
+    st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, 0);
     if (st_lookup(RCLASS(mod)->iv_tbl, autoload, &val)) {
 	struct st_table *tbl = check_autoload_table(val);
 
-	if (!st_delete(tbl, &id, &file)) file = Qnil;
+	if (!st_delete(tbl, (st_data_t*)&id, &file)) file = Qnil;
 
 	if (tbl->num_entries == 0) {
 	    DATA_PTR(val) = 0;
 	    st_free_table(tbl);
 	    id = autoload;
-	    if (st_delete(RCLASS(mod)->iv_tbl, &id, &val)) {
+	    if (st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val)) {
 		rb_gc_force_recycle(val);
 	    }
 	}
@@ -1242,12 +1242,12 @@ autoload_file(mod, id)
     }
 
     /* already loaded but not defined */
-    st_delete(tbl, &id, 0);
+    st_delete(tbl, (st_data_t*)&id, 0);
     if (!tbl->num_entries) {
 	DATA_PTR(val) = 0;
 	st_free_table(tbl);
 	id = autoload;
-	if (st_delete(RCLASS(mod)->iv_tbl, &id, &val)) {
+	if (st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val)) {
 	    rb_gc_force_recycle(val);
 	}
     }
@@ -1349,7 +1349,7 @@ rb_mod_remove_const(mod, name)
 	rb_raise(rb_eSecurityError, "Insecure: can't remove constant");
     if (OBJ_FROZEN(mod)) rb_error_frozen("class/module");
 
-    if (RCLASS(mod)->iv_tbl && st_delete(ROBJECT(mod)->iv_tbl, &id, &val)) {
+    if (RCLASS(mod)->iv_tbl && st_delete(ROBJECT(mod)->iv_tbl, (st_data_t*)&id, &val)) {
 	if (val == Qundef) {
 	    autoload_delete(mod, id);
 	    val = Qnil;
@@ -1750,7 +1750,7 @@ rb_mod_remove_cvar(mod, name)
 	rb_raise(rb_eSecurityError, "Insecure: can't remove class variable");
     if (OBJ_FROZEN(mod)) rb_error_frozen("class/module");
 
-    if (RCLASS(mod)->iv_tbl && st_delete(ROBJECT(mod)->iv_tbl, &id, &val)) {
+    if (RCLASS(mod)->iv_tbl && st_delete(ROBJECT(mod)->iv_tbl, (st_data_t*)&id, &val)) {
 	return val;
     }
     if (rb_cvar_defined(mod, id)) {

Original file line number	Diff line number	Diff line change
`@@ -1817,7 +1817,7 @@ rb_ary_and(ary1, ary2)`
`1817`	`1817`
`1818`	`1818`	`for (i=0; i<RARRAY(ary1)->len; i++) {`
`1819`	`1819`	`VALUE v = RARRAY(ary1)->ptr[i];`
`1820`		`- if (st_delete(RHASH(hash)->tbl, &v, 0)) {`
	`1820`	`+ if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {`
`1821`	`1821`	`rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);`
`1822`	`1822`	`}`
`1823`	`1823`	`}`
`@@ -1839,13 +1839,13 @@ rb_ary_or(ary1, ary2)`
`1839`	`1839`
`1840`	`1840`	`for (i=0; i<RARRAY(ary1)->len; i++) {`
`1841`	`1841`	`v = RARRAY(ary1)->ptr[i];`
`1842`		`- if (st_delete(RHASH(hash)->tbl, &v, 0)) {`
	`1842`	`+ if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {`
`1843`	`1843`	`rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);`
`1844`	`1844`	`}`
`1845`	`1845`	`}`
`1846`	`1846`	`for (i=0; i<RARRAY(ary2)->len; i++) {`
`1847`	`1847`	`v = RARRAY(ary2)->ptr[i];`
`1848`		`- if (st_delete(RHASH(hash)->tbl, &v, 0)) {`
	`1848`	`+ if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {`
`1849`	`1849`	`rb_ary_push(ary3, RARRAY(ary2)->ptr[i]);`
`1850`	`1850`	`}`
`1851`	`1851`	`}`
`@@ -1870,7 +1870,7 @@ rb_ary_uniq_bang(ary)`
`1870`	`1870`	`end = p + RARRAY(ary)->len;`
`1871`	`1871`	`while (p < end) {`
`1872`	`1872`	`VALUE v = *p;`
`1873`		`- if (st_delete(RHASH(hash)->tbl, &v, 0)) {`
	`1873`	`+ if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {`
`1874`	`1874`	`q++ = p;`
`1875`	`1875`	`}`
`1876`	`1876`	`p++;`
Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,7 @@ load_1(fd, disp, need_init)`
`675`	`675`	`char *key = sym->n_un.n_name;`
`676`	`676`
`677`	`677`	`if (st_lookup(sym_tbl, sym[1].n_un.n_name, &old_sym)) {`
`678`		`- if (st_delete(undef_tbl, &key, NULL)) {`
	`678`	`+ if (st_delete(undef_tbl, (st_data_t*)&key, NULL)) {`
`679`	`679`	`unlink_undef(key, old_sym->n_value);`
`680`	`680`	`free(key);`
`681`	`681`	`}`
`@@ -688,7 +688,7 @@ load_1(fd, disp, need_init)`
`688`	`688`	`st_foreach(reloc_tbl, reloc_repl, &data);`
`689`	`689`
`690`	`690`	`st_insert(undef_tbl, strdup(sym[1].n_un.n_name), NULL);`
`691`		`- if (st_delete(undef_tbl, &key, NULL)) {`
	`691`	`+ if (st_delete(undef_tbl, (st_data_t*)&key, NULL)) {`
`692`	`692`	`free(key);`
`693`	`693`	`}`
`694`	`694`	`}`
`@@ -756,7 +756,7 @@ load_1(fd, disp, need_init)`
`756`	`756`	`}`
`757`	`757`
`758`	`758`	`key = sym->n_un.n_name;`
`759`		`- if (st_delete(undef_tbl, &key, NULL) != 0) {`
	`759`	`+ if (st_delete(undef_tbl, (st_data_t*)&key, NULL) != 0) {`
`760`	`760`	`unlink_undef(key, sym->n_value);`
`761`	`761`	`free(key);`
`762`	`762`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8206,7 +8206,7 @@ rb_thread_save_context(th)`
`8206`	`8206`	`}`
`8207`	`8207`
`8208`	`8208`	`static int`
`8209`		`-thread_switch(n)`
	`8209`	`+rb_thread_switch(n)`
`8210`	`8210`	`int n;`
`8211`	`8211`	`{`
`8212`	`8212`	`rb_trap_immediate = (curr_thread->flags&0x100)?1:0;`
`@@ -8239,7 +8239,7 @@ thread_switch(n)`
`8239`	`8239`
`8240`	`8240`	`#define THREAD_SAVE_CONTEXT(th) \`
`8241`	`8241`	`(rb_thread_save_context(th),\`
`8242`		`- thread_switch((FLUSH_REGISTER_WINDOWS, setjmp((th)->context))))`
	`8242`	`+ rb_thread_switch((FLUSH_REGISTER_WINDOWS, setjmp((th)->context))))`
`8243`	`8243`
`8244`	`8244`	`static void rb_thread_restore_context _((rb_thread_t,int));`
`8245`	`8245`
`@@ -9137,21 +9137,21 @@ rb_thread_safe_level(thread)`
`9137`	`9137`	`return INT2NUM(th->safe);`
`9138`	`9138`	`}`
`9139`	`9139`
`9140`		`-static int thread_abort;`
	`9140`	`+static int ruby_thread_abort;`
`9141`	`9141`	`static VALUE thgroup_default;`
`9142`	`9142`
`9143`	`9143`	`static VALUE`
`9144`	`9144`	`rb_thread_s_abort_exc()`
`9145`	`9145`	`{`
`9146`		`- return thread_abort?Qtrue:Qfalse;`
	`9146`	`+ return ruby_thread_abort?Qtrue:Qfalse;`
`9147`	`9147`	`}`
`9148`	`9148`
`9149`	`9149`	`static VALUE`
`9150`	`9150`	`rb_thread_s_abort_exc_set(self, val)`
`9151`	`9151`	`VALUE self, val;`
`9152`	`9152`	`{`
`9153`	`9153`	`rb_secure(4);`
`9154`		`- thread_abort = RTEST(val);`
	`9154`	`+ ruby_thread_abort = RTEST(val);`
`9155`	`9155`	`return val;`
`9156`	`9156`	`}`
`9157`	`9157`
`@@ -9380,7 +9380,7 @@ rb_thread_start_0(fn, arg, th_arg)`
`9380`	`9380`	`rb_thread_raise(1, &ruby_errinfo, main_thread);`
`9381`	`9381`	`}`
`9382`	`9382`	`}`
`9383`		`- else if (th->safe < 4 && (thread_abort \|\| th->abort \|\| RTEST(ruby_debug))) {`
	`9383`	`+ else if (th->safe < 4 && (ruby_thread_abort \|\| th->abort \|\| RTEST(ruby_debug))) {`
`9384`	`9384`	`VALUE err = system_exit(1, 0, 0);`
`9385`	`9385`	`error_print();`
`9386`	`9386`	`/* exit on main_thread */`
`@@ -9733,7 +9733,7 @@ rb_thread_local_aset(thread, id, val)`
`9733`	`9733`	`th->locals = st_init_numtable();`
`9734`	`9734`	`}`
`9735`	`9735`	`if (NIL_P(val)) {`
`9736`		`- st_delete(th->locals, &id, 0);`
	`9736`	`+ st_delete(th->locals, (st_data_t*)&id, 0);`
`9737`	`9737`	`return Qnil;`
`9738`	`9738`	`}`
`9739`	`9739`	`st_insert(th->locals, id, val);`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ syck_emitter_flush( SyckEmitter *e, long check_room )`
`192`	`192`	`{`
`193`	`193`	`char *header = S_ALLOC_N( char, 64 );`
`194`	`194`	`S_MEMZERO( header, char, 64 );`
`195`		`- sprintf( header, "--- %YAML:%d.%d ", SYCK_YAML_MAJOR, SYCK_YAML_MINOR );`
	`195`	`+ sprintf( header, "--- %%YAML:%d.%d ", SYCK_YAML_MAJOR, SYCK_YAML_MINOR );`
`196`	`196`	`(e->handler)( e, header, strlen( header ) );`
`197`	`197`	`S_FREE( header );`
`198`	`198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1051,6 +1051,7 @@ rb_file_s_lchmod(argc, argv)`
`1051`	`1051`	`VALUE *argv;`
`1052`	`1052`	`{`
`1053`	`1053`	`rb_notimplement();`
	`1054`	`+ return Qnil; /* not reached */`
`1054`	`1055`	`}`
`1055`	`1056`	`#endif`
`1056`	`1057`
Original file line number	Diff line number	Diff line change
`@@ -1459,7 +1459,7 @@ undefine_final(os, obj)`
`1459`	`1459`	`VALUE os, obj;`
`1460`	`1460`	`{`
`1461`	`1461`	`if (finalizer_table) {`
`1462`		`- st_delete(finalizer_table, &obj, 0);`
	`1462`	`+ st_delete(finalizer_table, (st_data_t*)&obj, 0);`
`1463`	`1463`	`}`
`1464`	`1464`	`return obj;`
`1465`	`1465`	`}`
`@@ -1533,7 +1533,7 @@ run_final(obj)`
`1533`	`1533`	`args[0] = RARRAY(finalizers)->ptr[i];`
`1534`	`1534`	`rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);`
`1535`	`1535`	`}`
`1536`		`- if (finalizer_table && st_delete(finalizer_table, &obj, &table)) {`
	`1536`	`+ if (finalizer_table && st_delete(finalizer_table, (st_data_t*)&obj, &table)) {`
`1537`	`1537`	`for (i=0; i<RARRAY(table)->len; i++) {`
`1538`	`1538`	`args[0] = RARRAY(table)->ptr[i];`
`1539`	`1539`	`rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);`
Original file line number	Diff line number	Diff line change
`@@ -407,12 +407,12 @@ rb_hash_delete(hash, key)`
`407`	`407`
`408`	`408`	`rb_hash_modify(hash);`
`409`	`409`	`if (RHASH(hash)->iter_lev > 0) {`
`410`		`- if (st_delete_safe(RHASH(hash)->tbl, &key, &val, Qundef)) {`
	`410`	`+ if (st_delete_safe(RHASH(hash)->tbl, (st_data_t*)&key, &val, Qundef)) {`
`411`	`411`	`FL_SET(hash, HASH_DELETED);`
`412`	`412`	`return val;`
`413`	`413`	`}`
`414`	`414`	`}`
`415`		`- else if (st_delete(RHASH(hash)->tbl, &key, &val))`
	`415`	`+ else if (st_delete(RHASH(hash)->tbl, (st_data_t*)&key, &val))`
`416`	`416`	`return val;`
`417`	`417`	`if (rb_block_given_p()) {`
`418`	`418`	`return rb_yield(key);`