diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-22 04:27:32 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-22 04:27:32 +0000 |
commit | 1d38a821eaad46cd649a911b38a7d3540d6df8a9 (patch) | |
tree | dbe89708394d548a480ffe31af2a552a23887d62 /re.c | |
parent | 81525af4c9a8e512db6bd8b73c6fbe5ea39c865a (diff) | |
download | ruby-1d38a821eaad46cd649a911b38a7d3540d6df8a9.tar.gz |
* re.c (unescape_escaped_nonascii): back out the last change on
the function. [ruby-dev:36818]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r-- | re.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1967,12 +1967,8 @@ unescape_escaped_nonascii(const char **pp, const char *end, rb_encoding *enc, l = rb_enc_precise_mbclen(chbuf, chbuf+chlen, enc); if (MBCLEN_INVALID_P(l)) { - if (*encp == 0) - enc = *encp = rb_ascii8bit_encoding(); - else if (*encp != rb_ascii8bit_encoding()) { - strcpy(err, "invalid multibyte escape"); - return -1; - } + strcpy(err, "invalid multibyte escape"); + return -1; } if (1 < chlen || (chbuf[0] & 0x80)) { rb_str_buf_cat(buf, chbuf, chlen); |