1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c (rb_io_flags_mode): use hexadecimal in error message.

Browse Source 
(rb_io_modenum_mode): ditto.
  (rb_io_initialize): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-08-19 12:14:02 +00:00
parent fb7be908bb
commit 4bba634ae7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 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. * io.c (rb_io_flags_mode): add a prefix 0 to octal in error message.

6
io.c
View File

@ -3539,7 +3539,7 @@ rb_io_flags_mode(int flags)
} }
return MODE_BINMODE("r+", "rb+"); 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 */ return NULL; /* not reached */
} }
@ -3679,7 +3679,7 @@ rb_io_modenum_mode(int flags)
case O_RDWR: case O_RDWR:
return MODE_BINARY("r+", "rb+"); 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 */ return NULL; /* not reached */
} }
@ -5459,7 +5459,7 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
fmode = rb_io_modenum_flags(flags); fmode = rb_io_modenum_flags(flags);
if ((ofp->mode ^ fmode) & (FMODE_READWRITE|FMODE_BINMODE)) { if ((ofp->mode ^ fmode) & (FMODE_READWRITE|FMODE_BINMODE)) {
if (FIXNUM_P(mode)) { if (FIXNUM_P(mode)) {
rb_raise(rb_eArgError, "incompatible mode 0%o", flags); rb_raise(rb_eArgError, "incompatible mode 0x%x", flags);
} }
else { else {
rb_raise(rb_eArgError, "incompatible mode \"%s\"", RSTRING_PTR(mode)); rb_raise(rb_eArgError, "incompatible mode \"%s\"", RSTRING_PTR(mode));