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

cosmetic changes

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2009-07-10 13:17:43 +00:00
parent 257c314fbb
commit 67016f368c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
io.c
View File

@ -3935,15 +3935,16 @@ rb_io_fmode_modestr(int fmode)
} }
static int static int
io_encname_bom_p(const char *name, long len) { io_encname_bom_p(const char *name, long len)
{
if (len) { if (len) {
if (len > 4 && strncasecmp(name + len - 4, "-bom", 4) == 0) if (len > 4 && STRNCASECMP(name + len - 4, "-bom", 4) == 0)
return 1; return 1;
} }
else { else {
const char *p = strchr(name, ':'); const char *p = strchr(name, ':');
if (!p) p = name + strlen(name); if (!p) p = name + strlen(name);
if (p - name > 4 && strncasecmp(p - 4, "-bom", 4) == 0) if (p - name > 4 && STRNCASECMP(p - 4, "-bom", 4) == 0)
return 1; return 1;
} }
return 0; return 0;
@ -4527,7 +4528,8 @@ static VALUE rb_io_internal_encoding(VALUE);
static void io_encoding_set(rb_io_t *, VALUE, VALUE, VALUE); static void io_encoding_set(rb_io_t *, VALUE, VALUE, VALUE);
static int static int
io_strip_bom(VALUE io) { io_strip_bom(VALUE io)
{
int b1, b2, b3, b4; int b1, b2, b3, b4;
switch (b1 = FIX2INT(rb_io_getbyte(io))) { switch (b1 = FIX2INT(rb_io_getbyte(io))) {
case 0xEF: case 0xEF:
@ -4590,7 +4592,8 @@ io_strip_bom(VALUE io) {
} }
static void static void
io_set_encoding_by_bom(VALUE io) { io_set_encoding_by_bom(VALUE io)
{
int idx = io_strip_bom(io); int idx = io_strip_bom(io);
if (idx) { if (idx) {