summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--io.c2
-rw-r--r--sprintf.c1
3 files changed, 8 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index ab653c007e..d4915e44b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 8 14:31:36 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (io_fwrite): change dereference for cosmetic reason.
+
+ * sprintf.c (rb_f_sprintf): [ruby-dev:25104]
+
Tue Dec 7 19:08:00 2004 Akiyoshi, Masamichi <akiyoshi@hp.com>
* io.c (io_fwrite): fix offset incrementation (for VMS and Human68k)
@@ -69,15 +75,6 @@ Sat Dec 4 22:54:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (rb_hash_hash): should provide "hash" method where "eql?"
is redefined. [ruby-talk:122482]
-Sat Dec 4 00:35:08 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (bsock_setsockopt): [ruby-dev:25039]
-
-Sat Dec 4 22:54:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_hash): should provide "hash" method where "eql?"
- is redefined. [ruby-talk:122482]
-
Sat Dec 4 14:54:52 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* eval.c (proc_invoke): use volatile `tmp' rather than `args'.
diff --git a/io.c b/io.c
index 74ed5c74c5..1e77e5b4ba 100644
--- a/io.c
+++ b/io.c
@@ -417,7 +417,7 @@ io_fwrite(str, fptr)
}
#if defined(__human68k__) || defined(__vms)
do {
- if (fputc(*(RSTRING(str)->ptr+(offset++)), f) == EOF) {
+ if (fputc(RSTRING(str)->ptr[offset++], f) == EOF) {
if (ferror(f)) return -1L;
break;
}
diff --git a/sprintf.c b/sprintf.c
index 38283919e6..9ab87f251c 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -249,6 +249,7 @@ rb_f_sprintf(argc, argv)
fmt = GETNTHARG(0);
if (OBJ_TAINTED(fmt)) tainted = 1;
StringValue(fmt);
+ fmt = rb_str_new4(fmt);
p = RSTRING(fmt)->ptr;
end = p + RSTRING(fmt)->len;
blen = 0;