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

* string.c (coderange_scan): remove unused logic.

Browse Source 
* string.c (rb_str_coderange_scan_restartable): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-04-21 10:14:43 +00:00
parent 8581ce328d
commit 8377e9e435
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Apr 21 18:19:35 2014 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (coderange_scan): remove unused logic.
* string.c (rb_str_coderange_scan_restartable): ditto.
Mon Apr 21 14:11:48 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Apr 21 14:11:48 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_putc): fix for non-ascii * ext/stringio/stringio.c (strio_putc): fix for non-ascii

10
string.c
View File

@ -328,9 +328,6 @@ coderange_scan(const char *p, long len, rb_encoding *enc)
} }
} }
} }
if (e < p) {
return ENC_CODERANGE_BROKEN;
}
return ENC_CODERANGE_VALID; return ENC_CODERANGE_VALID;
} }
@ -342,9 +339,6 @@ coderange_scan(const char *p, long len, rb_encoding *enc)
} }
p += MBCLEN_CHARFOUND_LEN(ret); p += MBCLEN_CHARFOUND_LEN(ret);
} }
if (e < p) {
return ENC_CODERANGE_BROKEN;
}
return ENC_CODERANGE_VALID; return ENC_CODERANGE_VALID;
} }
@ -383,7 +377,7 @@ rb_str_coderange_scan_restartable(const char *s, const char *e, rb_encoding *enc
} }
} }
} }
*cr = e < p ? ENC_CODERANGE_BROKEN: ENC_CODERANGE_VALID; *cr = ENC_CODERANGE_VALID;
return p - s; return p - s;
} }
else { else {
@ -395,7 +389,7 @@ rb_str_coderange_scan_restartable(const char *s, const char *e, rb_encoding *enc
} }
p += MBCLEN_CHARFOUND_LEN(ret); p += MBCLEN_CHARFOUND_LEN(ret);
} }
*cr = e < p ? ENC_CODERANGE_BROKEN: ENC_CODERANGE_VALID; *cr = ENC_CODERANGE_VALID;
return p - s; return p - s;
} }
} }