diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | string.c | 10 |
2 files changed, 8 insertions, 8 deletions
@@ -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> * ext/stringio/stringio.c (strio_putc): fix for non-ascii @@ -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; } @@ -342,9 +339,6 @@ coderange_scan(const char *p, long len, rb_encoding *enc) } p += MBCLEN_CHARFOUND_LEN(ret); } - if (e < p) { - return ENC_CODERANGE_BROKEN; - } 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; } else { @@ -395,7 +389,7 @@ rb_str_coderange_scan_restartable(const char *s, const char *e, rb_encoding *enc } p += MBCLEN_CHARFOUND_LEN(ret); } - *cr = e < p ? ENC_CODERANGE_BROKEN: ENC_CODERANGE_VALID; + *cr = ENC_CODERANGE_VALID; return p - s; } } |