* dir.c (dir_s_glob): remove unused variable.

* math.c (math_log): ditto. * re.c (rb_reg_regcomp): ditto. * eval.c (break_jump): ditto. * eval.c (rb_thread_yield_0): remove unused function. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
gaynetdinov · Sep 18, 2006 · 749df1d · 749df1d
1 parent 392f342
commit 749df1d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 14 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Sep 18 10:47:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_s_glob): remove unused variable.
+
+	* math.c (math_log): ditto.
+
+	* re.c (rb_reg_regcomp): ditto.
+
+	* eval.c (break_jump): ditto.
+
+	* eval.c (rb_thread_yield_0): remove unused function.
+
 Sun Sep 17 23:44:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/rdoc.rb (RDoc::RDoc#document): scan only files modified

diff --git a/dir.c b/dir.c
@@ -1629,7 +1629,6 @@ dir_s_glob(int argc, VALUE *argv, VALUE obj)
 	ary = rb_push_glob(str, flags);
     }
     else {
-	volatile VALUE v = ary;
 	ary = dir_globs(RARRAY_LEN(ary), RARRAY_PTR(ary), flags);
     }
 

diff --git a/eval.c b/eval.c
@@ -4621,7 +4621,6 @@ static void
 break_jump(VALUE retval)
 {
     struct tag *tt = prot_tag;
-    int yield = 0;
 
     if (retval == Qundef) retval = Qnil;
     while (tt) {
@@ -11977,12 +11976,6 @@ rb_thread_terminated(rb_thread_t th, int state, enum thread_status status)
     ruby_stop(0);		/* last thread termination */
 }
 
-static VALUE
-rb_thread_yield_0(VALUE arg)
-{
-    return rb_thread_yield(arg, curr_thread);
-}
-
 static void
 rb_thread_start_1(void)
 {

diff --git a/gc.c b/gc.c
@@ -1266,7 +1266,7 @@ obj_free(VALUE obj)
 
       default:
 	rb_bug("gc_sweep(): unknown data type 0x%lx(%p)", 
-	       RANY(obj)->as.basic.flags & T_MASK, obj);
+	       RANY(obj)->as.basic.flags & T_MASK, (void*)obj);
     }
 }
 

diff --git a/math.c b/math.c
@@ -313,7 +313,7 @@ static VALUE
 math_log(int argc, VALUE *argv)
 {
     VALUE x, base;
-    double d, b;
+    double d;
 
     rb_scan_args(argc, argv, "11", &x, &base);
     Need_Float(x);

diff --git a/object.c b/object.c
@@ -250,7 +250,7 @@ rb_any_to_s(VALUE obj)
     char *cname = rb_obj_classname(obj);
     VALUE str;
 
-    str = rb_sprintf("#<%s:%p>", cname, obj);
+    str = rb_sprintf("#<%s:%p>", cname, (void*)obj);
     if (OBJ_TAINTED(obj)) OBJ_TAINT(str);
 
     return str;
@@ -327,7 +327,7 @@ rb_obj_inspect(VALUE obj)
 	char *c;
 
 	c = rb_obj_classname(obj);
-	str = rb_sprintf("-<%s:%p", c, obj);
+	str = rb_sprintf("-<%s:%p", c, (void*)obj);
 	return rb_exec_recursive(inspect_obj, obj, str);
     }
     return rb_funcall(obj, rb_intern("to_s"), 0, 0);

diff --git a/re.c b/re.c
@@ -1508,7 +1508,6 @@ static VALUE reg_cache;
 VALUE
 rb_reg_regcomp(VALUE str)
 {
-    volatile VALUE save_str = str;
     if (reg_cache && RREGEXP(reg_cache)->len == RSTRING_LEN(str)
 	&& case_cache == ruby_ignorecase
 	&& kcode_cache == reg_kcode

diff --git a/variable.c b/variable.c
@@ -196,7 +196,7 @@ rb_class_path(VALUE klass)
 		s = rb_class2name(RBASIC(klass)->klass);
 	    }
 	}
-	path = rb_sprintf("#<%s:%p>", s, klass);
+	path = rb_sprintf("#<%s:%p>", s, (void*)klass);
 	rb_ivar_set(klass, tmp_classpath, path);
 
 	return path;
-Original file line number
+Diff line change
@@ Expand Up / @@ -1629,7 +1629,6 @@ dir_s_glob(int argc, VALUE *argv, VALUE obj) @@
     	ary = rb_push_glob(str, flags);
         }
         else {
-    	volatile VALUE v = ary;
     	ary = dir_globs(RARRAY_LEN(ary), RARRAY_PTR(ary), flags);
         }
@@ Expand Down @@