diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -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 |
5 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,13 @@ +Thu Feb 3 16:34:10 2011 NARUSE, Yui <[email protected]> + + * 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. + Thu Feb 3 16:31:43 2011 NARUSE, Yui <[email protected]> * include/ruby/missing.h: don't use HAVE_STDDEF_H because it never 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; |