summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichal <michal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-08-28 14:59:01 +0000
committermichal <michal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-08-28 14:59:01 +0000
commit5c70716bdc3796ec62400b939dc2f5450def6b87 (patch)
tree16f0c5afc1f149f3b342fc78dee7b91312103eaa
parentb961db7587376bf451775d3654c19a9da5d3a73d (diff)
variable.c: Get rid of fix len buffer in rb_class_path (ruby-core:381)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2760 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--signal.c2
-rw-r--r--variable.c15
3 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 73586e4..2c2ba5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 28 23:59:15 2002 Michal Rokos <michal@ruby-lang.org>
+
+ * signal.c: remove #ifdef SIGINT for struct signals.
+
+ * variable.c: get rid of fix length buffer in rb_class_path.
+
Wed Aug 28 23:34:32 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* io.c (appendline): data was lost when raw mode.
diff --git a/signal.c b/signal.c
index 6b2d505..a4331a9 100644
--- a/signal.c
+++ b/signal.c
@@ -36,9 +36,7 @@ static struct signals {
#ifdef SIGHUP
{"HUP", SIGHUP},
#endif
-#ifdef SIGINT
{"INT", SIGINT},
-#endif
#ifdef SIGQUIT
{"QUIT", SIGQUIT},
#endif
diff --git a/variable.c b/variable.c
index bed8959..28b3f96 100644
--- a/variable.c
+++ b/variable.c
@@ -188,17 +188,22 @@ rb_class_path(klass)
if (path) return path;
else {
- char buf[256];
+ VALUE str;
char *s = "Class";
if (TYPE(klass) == T_MODULE) {
- if (rb_obj_class(klass) == rb_cModule)
+ if (rb_obj_class(klass) == rb_cModule) {
s = "Module";
- else
+ }
+ else {
s = rb_class2name(RBASIC(klass)->klass);
+ }
}
- sprintf(buf, "#<%s:0x%lx>", s, klass);
- return rb_str_new2(buf);
+ str = rb_str_new(0, 2 + strlen(s) + 3 + 2 * SIZEOF_LONG + 1);
+ sprintf(RSTRING(str)->ptr, "#<%s:0x%lx>", s, klass);
+ RSTRING(str)->len = strlen(RSTRING(str)->ptr);
+
+ return str;
}
}