diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-03 07:37:25 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-03 07:37:25 +0000 |
| commit | 10354c7b5c5d09b2b059fe96c072938145247c5b (patch) | |
| tree | ad4a7e8c9c778649140539fe9080931177eef8ba /enc | |
| parent | a3b4b499a5ddd35572d7033ddb28ecf1c668bfce (diff) | |
* enc/shift_jis.c (code_to_mbc): cast as int from the subtraction of pointers.
* enc/utf_16le.c (utf16le_mbc_enc_len): use ptrdiff_t.
* enc/utf_32be.c (utf32be_left_adjust_char_head): ditto.
* enc/utf_32le.c (utf32le_left_adjust_char_head): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30771 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/shift_jis.c | 2 | ||||
| -rw-r--r-- | enc/utf_16le.c | 3 | ||||
| -rw-r--r-- | enc/utf_32be.c | 2 | ||||
| -rw-r--r-- | enc/utf_32le.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/enc/shift_jis.c b/enc/shift_jis.c index ee726cf71a..b8ca67dba1 100644 --- a/enc/shift_jis.c +++ b/enc/shift_jis.c @@ -175,7 +175,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) if (enclen(enc, buf) != (p - buf)) return REGERR_INVALID_CODE_POINT_VALUE; #endif - return p - buf; + return (int)(p - buf); } static int diff --git a/enc/utf_16le.c b/enc/utf_16le.c index bec3d22388..0dec8f98c5 100644 --- a/enc/utf_16le.c +++ b/enc/utf_16le.c @@ -56,7 +56,8 @@ static int utf16le_mbc_enc_len(const UChar* p, const OnigUChar* e, OnigEncoding enc ARG_UNUSED) { - int len = e-p, byte; + ptrdiff_t len = e - p; + UChar byte; if (len < 2) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1); byte = p[1]; diff --git a/enc/utf_32be.c b/enc/utf_32be.c index 61e7d0f1b5..2671448d44 100644 --- a/enc/utf_32be.c +++ b/enc/utf_32be.c @@ -155,7 +155,7 @@ static UChar* utf32be_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED) { - int rem; + ptrdiff_t rem; if (s <= start) return (UChar* )s; diff --git a/enc/utf_32le.c b/enc/utf_32le.c index 3a0a41bba7..aa448200c6 100644 --- a/enc/utf_32le.c +++ b/enc/utf_32le.c @@ -155,7 +155,7 @@ static UChar* utf32le_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED) { - int rem; + ptrdiff_t rem; if (s <= start) return (UChar* )s; |