From 5a9a84efe7858d39ae681e22dd817cd176241f9c Mon Sep 17 00:00:00 2001 From: knu Date: Tue, 27 Feb 2007 10:38:32 +0000 Subject: [PATCH] * regex.c (calculate_must_string, slow_search, re_search): Silence warnings regarding char * vs. unsigned char * mismatch; submitted by Lyle Johnson in [ruby-core:10416]. * ext/bigdecimal/bigdecimal.c (BigDecimal_load): Ditto. * ext/digest/sha1/sha1ossl.c (SHA1_Finish): Ditto. * ext/digest/rmd160/rmd160ossl.c (RMD160_Finish): Ditto. * ext/digest/digest.c (rb_digest_base_finish, rb_digest_base_update): Ditto. * ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1, rb_nkf_guess2): Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 19 +++++++++++++++++++ ext/bigdecimal/bigdecimal.c | 4 ++-- ext/digest/digest.c | 4 ++-- ext/digest/rmd160/rmd160ossl.c | 2 +- ext/digest/sha1/sha1ossl.c | 2 +- ext/nkf/nkf.c | 10 +++++----- regex.c | 18 +++++++++--------- 7 files changed, 39 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ee8d79ed9..e4999ab0b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +Tue Feb 27 19:36:57 2007 Akinori MUSHA + + * regex.c (calculate_must_string, slow_search, re_search): Silence + warnings regarding char * vs. unsigned char * mismatch; + submitted by Lyle Johnson + in [ruby-core:10416]. + + * ext/bigdecimal/bigdecimal.c (BigDecimal_load): Ditto. + + * ext/digest/sha1/sha1ossl.c (SHA1_Finish): Ditto. + + * ext/digest/rmd160/rmd160ossl.c (RMD160_Finish): Ditto. + + * ext/digest/digest.c (rb_digest_base_finish, + rb_digest_base_update): Ditto. + + * ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1, + rb_nkf_guess2): Ditto. + Tue Feb 27 03:40:09 2007 Akinori MUSHA * ext/thread/thread.c (wait_list_cleanup, rb_mutex_try_lock): diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index 5a26ea79d9..efbf29f92d 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -332,7 +332,7 @@ BigDecimal_load(VALUE self, VALUE str) unsigned long m=0; SafeStringValue(str); - pch = RSTRING_PTR(str); + pch = (unsigned char *)RSTRING_PTR(str); /* First get max prec */ while((*pch)!=(unsigned char)'\0' && (ch=*pch++)!=(unsigned char)':') { if(!ISDIGIT(ch)) { @@ -341,7 +341,7 @@ BigDecimal_load(VALUE self, VALUE str) m = m*10 + (unsigned long)(ch-'0'); } if(m>VpBaseFig()) m -= VpBaseFig(); - GUARD_OBJ(pv,VpNewRbClass(m,pch,self)); + GUARD_OBJ(pv,VpNewRbClass(m,(char *)pch,self)); m /= VpBaseFig(); if(m && pv->MaxPrec>m) pv->MaxPrec = m+1; return ToValue(pv); diff --git a/ext/digest/digest.c b/ext/digest/digest.c index c4a58cf3f6..07484f897f 100644 --- a/ext/digest/digest.c +++ b/ext/digest/digest.c @@ -519,7 +519,7 @@ rb_digest_base_update(VALUE self, VALUE str) Data_Get_Struct(self, void, pctx); StringValue(str); - algo->update_func(pctx, RSTRING_PTR(str), RSTRING_LEN(str)); + algo->update_func(pctx, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str)); return self; } @@ -537,7 +537,7 @@ rb_digest_base_finish(VALUE self) Data_Get_Struct(self, void, pctx); str = rb_str_new(0, algo->digest_len); - algo->finish_func(pctx, RSTRING_PTR(str)); + algo->finish_func(pctx, (unsigned char *)RSTRING_PTR(str)); /* avoid potential coredump caused by use of a finished context */ algo->init_func(pctx); diff --git a/ext/digest/rmd160/rmd160ossl.c b/ext/digest/rmd160/rmd160ossl.c index 5d8c5ba470..f24e63e3d8 100644 --- a/ext/digest/rmd160/rmd160ossl.c +++ b/ext/digest/rmd160/rmd160ossl.c @@ -4,5 +4,5 @@ #include "rmd160ossl.h" void RMD160_Finish(RMD160_CTX *ctx, char *buf) { - RIPEMD160_Final(buf, ctx); + RIPEMD160_Final((unsigned char *)buf, ctx); } diff --git a/ext/digest/sha1/sha1ossl.c b/ext/digest/sha1/sha1ossl.c index adf5cf267c..452cf35084 100644 --- a/ext/digest/sha1/sha1ossl.c +++ b/ext/digest/sha1/sha1ossl.c @@ -6,5 +6,5 @@ void SHA1_Finish(SHA1_CTX *ctx, char *buf) { - SHA1_Final(buf, ctx); + SHA1_Final((unsigned char *)buf, ctx); } diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index 8eb92b6cd6..2bb0340a64 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -63,7 +63,7 @@ rb_nkf_putchar(c) o_len += incsize; rb_str_resize(result, o_len); incsize *= 2; - output = RSTRING(result)->ptr; + output = (unsigned char *)RSTRING(result)->ptr; } output[output_ctr++] = c; @@ -158,13 +158,13 @@ rb_nkf_kconv(obj, opt, src) input_ctr = 0; StringValue(src); - input = RSTRING(src)->ptr; + input = (unsigned char *)RSTRING(src)->ptr; i_len = RSTRING(src)->len; result = rb_str_new(0, i_len*3 + 10); v = result; output_ctr = 0; - output = RSTRING(result)->ptr; + output = (unsigned char *)RSTRING(result)->ptr; o_len = RSTRING(result)->len; *output = '\0'; @@ -213,7 +213,7 @@ rb_nkf_guess1(obj, src) int sequence_counter = 0; StringValue(src); - p = RSTRING(src)->ptr; + p = (unsigned char *)RSTRING(src)->ptr; pend = p + RSTRING(src)->len; if (p == pend) return INT2FIX(_UNKNOWN); @@ -328,7 +328,7 @@ rb_nkf_guess2(obj, src) input_ctr = 0; StringValue(src); - input = RSTRING(src)->ptr; + input = (unsigned char *)RSTRING(src)->ptr; i_len = RSTRING(src)->len; if(x0201_f == WISH_TRUE) diff --git a/regex.c b/regex.c index ae0694b764..fa04871c1b 100644 --- a/regex.c +++ b/regex.c @@ -1014,8 +1014,8 @@ calculate_must_string(start, end) { int mcnt; int max = 0; - unsigned char *p = start; - unsigned char *pend = end; + unsigned char *p = (unsigned char *)start; + unsigned char *pend = (unsigned char *)end; char *must = 0; if (start == NULL) return 0; @@ -1029,7 +1029,7 @@ calculate_must_string(start, end) case exactn: mcnt = *p; if (mcnt > max) { - must = p; + must = (char *)p; max = mcnt; } p += mcnt+1; @@ -2689,7 +2689,7 @@ slow_search(little, llen, big, blen, translate) } } - if (slow_match(little, little+llen, big, bend, translate)) + if (slow_match(little, little+llen, big, bend, (unsigned char *)translate)) return big - bsave; big+=mbclen(*big); @@ -3222,13 +3222,13 @@ re_search(bufp, string, size, startpos, range, regs) } pend = size; if (bufp->options & RE_OPTIMIZE_NO_BM) { - pos = slow_search(bufp->must+1, len, - string+pbeg, pend-pbeg, - MAY_TRANSLATE()?translate:0); + pos = slow_search((unsigned char *)(bufp->must+1), len, + (unsigned char*)(string+pbeg), pend-pbeg, + (char *)(MAY_TRANSLATE()?translate:0)); } else { - pos = bm_search(bufp->must+1, len, - string+pbeg, pend-pbeg, + pos = bm_search((unsigned char *)(bufp->must+1), len, + (unsigned char *)(string+pbeg), pend-pbeg, bufp->must_skip, MAY_TRANSLATE()?translate:0); }