summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-19 12:14:02 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-19 12:14:02 +0000
commit095bfee76cd046e45bf8b4d8f540e9f6a8748f73 (patch)
tree5f16f1e55f65cff58cc6e682e022a04ff2ab862f
parente1f0a72affd3f8af9d5c7f17875182017a073c9e (diff)
downloadruby-095bfee76cd046e45bf8b4d8f540e9f6a8748f73.tar.gz
ruby-095bfee76cd046e45bf8b4d8f540e9f6a8748f73.tar.xz
ruby-095bfee76cd046e45bf8b4d8f540e9f6a8748f73.zip
* io.c (rb_io_flags_mode): use hexadecimal in error message.
(rb_io_modenum_mode): ditto. (rb_io_initialize): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--io.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 74718fc19..66025e924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 19 21:13:08 2008 Tanaka Akira <akr@fsij.org>
+
+ * io.c (rb_io_flags_mode): use hexadecimal in error message.
+ (rb_io_modenum_mode): ditto.
+ (rb_io_initialize): ditto.
+
Tue Aug 19 18:23:40 2008 Tanaka Akira <akr@fsij.org>
* io.c (rb_io_flags_mode): add a prefix 0 to octal in error message.
diff --git a/io.c b/io.c
index a9229cf2f..57e1c22bc 100644
--- a/io.c
+++ b/io.c
@@ -3539,7 +3539,7 @@ rb_io_flags_mode(int flags)
}
return MODE_BINMODE("r+", "rb+");
}
- rb_raise(rb_eArgError, "invalid access modenum 0%o", flags);
+ rb_raise(rb_eArgError, "invalid access modenum 0x%x", flags);
return NULL; /* not reached */
}
@@ -3679,7 +3679,7 @@ rb_io_modenum_mode(int flags)
case O_RDWR:
return MODE_BINARY("r+", "rb+");
}
- rb_raise(rb_eArgError, "invalid access modenum 0%o", flags);
+ rb_raise(rb_eArgError, "invalid access modenum 0x%x", flags);
return NULL; /* not reached */
}
@@ -5459,7 +5459,7 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
fmode = rb_io_modenum_flags(flags);
if ((ofp->mode ^ fmode) & (FMODE_READWRITE|FMODE_BINMODE)) {
if (FIXNUM_P(mode)) {
- rb_raise(rb_eArgError, "incompatible mode 0%o", flags);
+ rb_raise(rb_eArgError, "incompatible mode 0x%x", flags);
}
else {
rb_raise(rb_eArgError, "incompatible mode \"%s\"", RSTRING_PTR(mode));