diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-27 10:35:17 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-27 10:35:17 +0000 |
| commit | 5144ec51e5b0842cab2bbb737bc57d3ee4104adb (patch) | |
| tree | 69623ba4c18ae76cc6ec7068ce3406d324371735 | |
| parent | a02dc2f486ac01b94bc4b4d10c6352666e80aa6b (diff) | |
| download | ruby-5144ec51e5b0842cab2bbb737bc57d3ee4104adb.tar.gz ruby-5144ec51e5b0842cab2bbb737bc57d3ee4104adb.tar.xz ruby-5144ec51e5b0842cab2bbb737bc57d3ee4104adb.zip | |
* ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
rb_nkf_guess2): Silence warnings regarding char * vs. unsigned
char * mismatch; submitted by Lyle Johnson
<lyle.johnson@gmail.com> in [ruby-core:10416].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/nkf/nkf.c | 10 |
2 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,10 @@ +Tue Feb 27 19:26:31 2007 Akinori MUSHA <knu@iDaemons.org> + + * ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1, + rb_nkf_guess2): Silence warnings regarding char * vs. unsigned + char * mismatch; submitted by Lyle Johnson + <lyle.johnson@gmail.com> in [ruby-core:10416]. + Tue Feb 27 19:15:01 2007 Akinori MUSHA <knu@iDaemons.org> * lib/base64.rb (Base64::b64encode): Fix documentation; submitted diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index e12df1696..1cc582ac1 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -62,7 +62,7 @@ rb_nkf_putchar(unsigned int c) o_len += incsize; rb_str_resize(result, o_len); incsize *= 2; - output = RSTRING_PTR(result); + output = (unsigned char *)RSTRING_PTR(result); } output[output_ctr++] = c; @@ -155,13 +155,13 @@ rb_nkf_kconv(VALUE obj, VALUE opt, VALUE src) input_ctr = 0; StringValue(src); - input = RSTRING_PTR(src); + input = (unsigned char *)RSTRING_PTR(src); i_len = RSTRING_LEN(src); result = rb_str_new(0, i_len*3 + 10); v = result; output_ctr = 0; - output = RSTRING_PTR(result); + output = (unsigned char *)RSTRING_PTR(result); o_len = RSTRING_LEN(result); *output = '\0'; @@ -208,7 +208,7 @@ rb_nkf_guess1(VALUE obj, VALUE src) int sequence_counter = 0; StringValue(src); - p = RSTRING_PTR(src); + p = (unsigned char *)RSTRING_PTR(src); pend = p + RSTRING_LEN(src); if (p == pend) return INT2FIX(_UNKNOWN); @@ -324,7 +324,7 @@ rb_nkf_guess2(VALUE obj, VALUE src) input_ctr = 0; StringValue(src); - input = RSTRING_PTR(src); + input = (unsigned char *)RSTRING_PTR(src); i_len = RSTRING_LEN(src); if(x0201_f == WISH_TRUE) |