diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-18 08:05:32 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-18 08:05:32 +0000 |
commit | c3c29381b8c90a4cc27e08f1e8a337a95037c90f (patch) | |
tree | bdb9cf7c15bd7db7fdaa0ddf4ee53e03e58f5780 /encoding.c | |
parent | 932b5cf7115dcd87435f2c2ab2f054e94b9ef367 (diff) | |
download | ruby-c3c29381b8c90a4cc27e08f1e8a337a95037c90f.tar.gz ruby-c3c29381b8c90a4cc27e08f1e8a337a95037c90f.tar.xz ruby-c3c29381b8c90a4cc27e08f1e8a337a95037c90f.zip |
* suppressed shorten-64-to-32 warnings.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r-- | encoding.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/encoding.c b/encoding.c index 2f0b9797d..5e54ce721 100644 --- a/encoding.c +++ b/encoding.c @@ -539,16 +539,16 @@ rb_enc_find(const char *name) static inline int enc_capable(VALUE obj) { - if (SPECIAL_CONST_P(obj)) return Qfalse; + if (SPECIAL_CONST_P(obj)) return FALSE; switch (BUILTIN_TYPE(obj)) { case T_STRING: case T_REGEXP: case T_FILE: - return Qtrue; + return TRUE; case T_DATA: - if (RDATA(obj)->dmark == enc_mark) return Qtrue; + if (RDATA(obj)->dmark == enc_mark) return TRUE; default: - return Qfalse; + return FALSE; } } @@ -744,7 +744,7 @@ rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc) return MBCLEN_CHARFOUND_LEN(n); else { int min = rb_enc_mbminlen(enc); - return min <= e-p ? min : e-p; + return min <= e-p ? min : (int)(e-p); } } @@ -756,7 +756,7 @@ rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1); n = ONIGENC_PRECISE_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e); if (e-p < n) - return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(n-(e-p)); + return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(n-(int)(e-p)); return n; } @@ -1071,10 +1071,11 @@ struct default_encoding { static int enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const char *name) { - int overridden = Qfalse; + int overridden = FALSE; + if (def->index != -2) /* Already set */ - overridden = Qtrue; + overridden = TRUE; if (NIL_P(encoding)) { def->index = -1; |