summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-31 09:28:20 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-31 09:28:20 +0000
commit075530a6850ebf899e8874d7675fd900577c9554 (patch)
tree45dd63e7b9262c43ebd8ef19b0057a150d1e3eb5 /object.c
parent1b039e2a922db417e7fd7e5175476497fb083e7e (diff)
* suppress warnings with -Wwrite-string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'object.c')
-rw-r--r--object.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/object.c b/object.c
index 2105b1ac50..5d49b2ab6f 100644
--- a/object.c
+++ b/object.c
@@ -298,7 +298,7 @@ rb_obj_init_copy(VALUE obj, VALUE orig)
VALUE
rb_any_to_s(VALUE obj)
{
- char *cname = rb_obj_classname(obj);
+ const char *cname = rb_obj_classname(obj);
VALUE str;
str = rb_sprintf("#<%s:%p>", cname, (void*)obj);
@@ -387,9 +387,8 @@ rb_obj_inspect(VALUE obj)
if (has_ivar) {
VALUE str;
- char *c;
+ const char *c = rb_obj_classname(obj);
- c = rb_obj_classname(obj);
str = rb_sprintf("-<%s:%p", c, (void*)obj);
return rb_exec_recursive(inspect_obj, obj, str);
}
@@ -1916,7 +1915,7 @@ rb_convert_type(VALUE val, int type, const char *tname, const char *method)
if (TYPE(val) == type) return val;
v = convert_type(val, tname, method, Qtrue);
if (TYPE(v) != type) {
- char *cname = rb_obj_classname(val);
+ const char *cname = rb_obj_classname(val);
rb_raise(rb_eTypeError, "can't convert %s to %s (%s#%s gives %s)",
cname, tname, cname, method, rb_obj_classname(v));
}
@@ -1933,7 +1932,7 @@ rb_check_convert_type(VALUE val, int type, const char *tname, const char *method
v = convert_type(val, tname, method, Qfalse);
if (NIL_P(v)) return Qnil;
if (TYPE(v) != type) {
- char *cname = rb_obj_classname(val);
+ const char *cname = rb_obj_classname(val);
rb_raise(rb_eTypeError, "can't convert %s to %s (%s#%s gives %s)",
cname, tname, cname, method, rb_obj_classname(v));
}
@@ -1949,7 +1948,7 @@ rb_to_integer(VALUE val, const char *method)
if (FIXNUM_P(val)) return val;
v = convert_type(val, "Integer", method, Qtrue);
if (!rb_obj_is_kind_of(v, rb_cInteger)) {
- char *cname = rb_obj_classname(val);
+ const char *cname = rb_obj_classname(val);
rb_raise(rb_eTypeError, "can't convert %s to Integer (%s#%s gives %s)",
cname, cname, method, rb_obj_classname(v));
}