From 8a6c699282f975faff73d9e3bbf4d45af6fd8935 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 31 Jul 2008 01:51:44 +0000 Subject: * iseq.c (ruby_iseq_disasm_insn): suppress warnings on platforms which int size differs from pointer size. * ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): ditto * ext/syck/rubyext.c (rb_syck_err_handler), (syck_default_error_handler): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ ext/openssl/ossl_asn1.c | 2 +- ext/syck/rubyext.c | 2 +- ext/syck/syck.c | 2 +- iseq.c | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d2e84698c..9120400c5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu Jul 31 10:51:39 2008 Nobuyoshi Nakada + + * iseq.c (ruby_iseq_disasm_insn): suppress warnings on platforms which + int size differs from pointer size. + + * ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): ditto + + * ext/syck/rubyext.c (rb_syck_err_handler), + (syck_default_error_handler): ditto. + Thu Jul 31 02:21:39 2008 Yusuke Endoh * ext/syck/rubyext.c (rb_syck_compile): remove meaningless branch diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index 671bac14c1..e6d09fbca1 100644 --- a/ext/openssl/ossl_asn1.c +++ b/ext/openssl/ossl_asn1.c @@ -495,7 +495,7 @@ ossl_asn1_get_asn1type(VALUE obj) value = ossl_asn1_get_value(obj); switch(tag){ case V_ASN1_BOOLEAN: - ptr = (void*)obj_to_asn1bool(value); + ptr = (void*)(VALUE)obj_to_asn1bool(value); free_func = NULL; break; case V_ASN1_INTEGER: /* FALLTHROUGH */ diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c index cb3ad260ec..c229f0d4dd 100644 --- a/ext/syck/rubyext.c +++ b/ext/syck/rubyext.c @@ -644,7 +644,7 @@ rb_syck_err_handler(SyckParser *p, const char *msg) endl++; endl[0] = '\0'; - rb_raise(rb_eArgError, "%s on line %d, col %d: `%s'", + rb_raise(rb_eArgError, "%s on line %d, col %"PRIdPTRDIFF": `%s'", msg, p->linect, p->cursor - p->lineptr, diff --git a/ext/syck/syck.c b/ext/syck/syck.c index ccbce4822c..dbf753337e 100644 --- a/ext/syck/syck.c +++ b/ext/syck/syck.c @@ -499,7 +499,7 @@ syck_parse( SyckParser *p ) void syck_default_error_handler( SyckParser *p, const char *msg ) { - printf( "Error at [Line %d, Col %d]: %s\n", + printf( "Error at [Line %d, Col %"PRIdPTRDIFF"]: %s\n", p->linect, p->cursor - p->lineptr, msg ); diff --git a/iseq.c b/iseq.c index 29b331d97f..84bef80420 100644 --- a/iseq.c +++ b/iseq.c @@ -733,7 +733,7 @@ ruby_iseq_disasm_insn(VALUE ret, VALUE *iseq, int pos, } else { rb_str_catf(str, "%04d %-16.*s ", pos, - strcspn(insn_name_buff, "_"), insn_name_buff); + (int)strcspn(insn_name_buff, "_"), insn_name_buff); } for (j = 0; types[j]; j++) { -- cgit v1.2.3