summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-18 01:59:00 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-18 01:59:00 +0000
commit749df1d0fd6252b73d0f283feebb597f6f750bdf (patch)
tree5a2796521a2c923270736344e1cb1d9d1052b461
parent392f342f04b8039bb5a352b17dac02311e260276 (diff)
* 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
-rw-r--r--ChangeLog12
-rw-r--r--dir.c1
-rw-r--r--eval.c7
-rw-r--r--gc.c2
-rw-r--r--math.c2
-rw-r--r--object.c4
-rw-r--r--re.c1
-rw-r--r--variable.c2
8 files changed, 17 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a12d30d9a..f874fc5610 100644
--- 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
index 144d903e1f..13f1a51c7f 100644
--- 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
index 7bc11350c1..4cca629a86 100644
--- 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
index 34e89633b0..582dd66ae0 100644
--- 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
index 9bc7e2a402..2675c71e6d 100644
--- 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
index dae9c78e89..b4df7da397 100644
--- 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
index dd000140dd..8f4d14dfc9 100644
--- 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
index 11a3017339..9c51b9d4d5 100644
--- 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;