diff options
author | 卜部昌平 <shyouhei@ruby-lang.org> | 2021-10-05 11:39:05 +0900 |
---|---|---|
committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2021-10-05 14:18:23 +0900 |
commit | f032c09bca96d82ce5fe935c99afed4c3fc2dbea (patch) | |
tree | 0d5acf6a6daf2aa13f01538b7eb693b99e2d1211 | |
parent | 499660b04f22c0b7203dbd1de31a85443d4290b4 (diff) |
rb_enc_left_char_head(): take void*
Nobu doesn't like (char*) cast.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4909
-rw-r--r-- | include/ruby/internal/encoding/encoding.h | 2 | ||||
-rw-r--r-- | string.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/ruby/internal/encoding/encoding.h b/include/ruby/internal/encoding/encoding.h index b4274b7f55..ae2e15773d 100644 --- a/include/ruby/internal/encoding/encoding.h +++ b/include/ruby/internal/encoding/encoding.h @@ -694,7 +694,7 @@ rb_enc_prev_char(const char *s, const char *p, const char *e, const rb_encoding * @return Pointer to the head of the character that contains `p`. */ static inline char * -rb_enc_left_char_head(const char *s, const char *p, const char *e, const rb_encoding *enc) +rb_enc_left_char_head(const char *s, const void *p, const char *e, const rb_encoding *enc) { const OnigUChar *us = RBIMPL_CAST((const OnigUChar *)s); const OnigUChar *up = RBIMPL_CAST((const OnigUChar *)p); @@ -5738,7 +5738,7 @@ rb_str_setbyte(VALUE str, VALUE index, VALUE value) ENC_CODERANGE_SET(str, ENC_CODERANGE_VALID); goto end; case ENC_CODERANGE_VALID: - left = rb_enc_left_char_head(head, (char *)ptr, head+len, enc); + left = rb_enc_left_char_head(head, ptr, head+len, enc); width = rb_enc_precise_mbclen(left, head+len, enc); *ptr = byte; nlen = rb_enc_precise_mbclen(left, head+len, enc); |