aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--vm_backtrace.c10
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8640f9e048..f75b7b3902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 15 20:54:28 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * vm_backtrace.c (backtrace_collect): rename from backtreace_collect.
+
Fri Jun 15 09:01:35 2012 Yuki Yugui Sonoda <yugui@google.com>
Fri Jun 15 19:22:13 2012 Koichi Sasada <ko1@atdot.net>
diff --git a/vm_backtrace.c b/vm_backtrace.c
index 47ae7f1dee..c4fbaba33e 100644
--- a/vm_backtrace.c
+++ b/vm_backtrace.c
@@ -467,13 +467,13 @@ rb_vm_backtrace_object(void)
}
static VALUE
-backtreace_collect(rb_backtrace_t *bt, int lev, int n, VALUE (*func)(rb_backtrace_location_t *, void *arg), void *arg)
+backtrace_collect(rb_backtrace_t *bt, int lev, int n, VALUE (*func)(rb_backtrace_location_t *, void *arg), void *arg)
{
VALUE btary;
int i;
if (UNLIKELY(lev < 0 || n < 0)) {
- rb_bug("backtreace_collect: unreachable");
+ rb_bug("backtrace_collect: unreachable");
}
btary = rb_ary_new();
@@ -502,7 +502,7 @@ rb_backtrace_to_str_ary(VALUE self)
return bt->strary;
}
else {
- bt->strary = backtreace_collect(bt, 0, bt->backtrace_size, location_to_str_dmyarg, 0);
+ bt->strary = backtrace_collect(bt, 0, bt->backtrace_size, location_to_str_dmyarg, 0);
return bt->strary;
}
}
@@ -522,7 +522,7 @@ backtrace_to_str_ary2(VALUE self, int lev, int n)
return Qnil;
}
- return backtreace_collect(bt, lev, n, location_to_str_dmyarg, 0);
+ return backtrace_collect(bt, lev, n, location_to_str_dmyarg, 0);
}
static VALUE
@@ -553,7 +553,7 @@ backtrace_to_frame_ary(VALUE self, int lev, int n)
return Qnil;
}
- return backtreace_collect(bt, lev, n, location_create, (void *)self);
+ return backtrace_collect(bt, lev, n, location_create, (void *)self);
}
static VALUE