diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-11 03:08:50 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-11 03:08:50 +0000 |
| commit | 257d79ae2d955b7fc2153a5efcb9cd5c2505cb2a (patch) | |
| tree | 04a037e87e0e86eac5a46d8582c77836767f53d2 /include/ruby | |
| parent | 10d13f89c7302cdb77349f6bdfa1d8c2576b6179 (diff) | |
| download | ruby-257d79ae2d955b7fc2153a5efcb9cd5c2505cb2a.tar.gz ruby-257d79ae2d955b7fc2153a5efcb9cd5c2505cb2a.tar.xz ruby-257d79ae2d955b7fc2153a5efcb9cd5c2505cb2a.zip | |
* encoding.c (rb_enc_get_ascii): add an argument to provide the
length of the returned character.
* include/ruby/encoding.h (rb_enc_get_ascii): add the argument.
* re.c (rb_reg_expr_str): modify rb_enc_get_ascii call.
(rb_reg_quote): ditto.
(rb_reg_regsub): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
| -rw-r--r-- | include/ruby/encoding.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 38ba031e6..dd30e66df 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -72,14 +72,14 @@ rb_encoding * rb_enc_find(const char *name); /* ptr,endptr,encoding -> mbclen */ int rb_enc_mbclen(const char*, const char *, rb_encoding*); -/* ptr,endptr,encoding -> chlen, invalid or needmore */ -int rb_enc_precise_mbclen(const char*, const char *, rb_encoding*); +/* -> chlen, invalid or needmore */ +int rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc); #define MBCLEN_CHARFOUND(ret) ONIGENC_MBCLEN_CHARFOUND(ret) #define MBCLEN_INVALID(ret) ONIGENC_MBCLEN_INVALID(ret) #define MBCLEN_NEEDMORE(ret) ONIGENC_MBCLEN_NEEDMORE(ret) -/* ptr,endptr,encoding -> 0x00..0x7f, -1 */ -int rb_enc_get_ascii(const char*, const char *, rb_encoding*); +/* -> 0x00..0x7f, -1 */ +int rb_enc_get_ascii(const char *p, const char *e, int *len, rb_encoding *enc); /* code,encoding -> codelen */ int rb_enc_codelen(int, rb_encoding*); |