mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* insns.def (DEFINE_INSN): subtract of pointers is ptrdiff_t.
this is not int on 64bit system. * vm_dump.c (control_frame_dump): ditto. * vm_dump.c (stack_dump_each): ditto. * vm_dump.c (debug_print_register): ditto. * vm_dump.c (debug_print_pre): ditto. * transcode.c (str_transcode): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
cf0109cff7
commit
9256f94d9a
5 changed files with 34 additions and 19 deletions
|
@ -326,7 +326,7 @@ str_transcode(int argc, VALUE *argv, VALUE *self)
|
|||
my_transcoding.ruby_string_dest = dest;
|
||||
(*my_transcoder->preprocessor)(&fromp, &bp, (sp+slen), (bp+blen), &my_transcoding);
|
||||
if (fromp != sp+slen) {
|
||||
rb_raise(rb_eArgError, "not fully converted, %d bytes left", sp+slen-fromp);
|
||||
rb_raise(rb_eArgError, "not fully converted, %td bytes left", sp+slen-fromp);
|
||||
}
|
||||
buf = (unsigned char *)RSTRING_PTR(dest);
|
||||
*bp = '\0';
|
||||
|
@ -343,7 +343,7 @@ str_transcode(int argc, VALUE *argv, VALUE *self)
|
|||
|
||||
transcode_loop(&fromp, &bp, (sp+slen), (bp+blen), my_transcoder, &my_transcoding, options);
|
||||
if (fromp != sp+slen) {
|
||||
rb_raise(rb_eArgError, "not fully converted, %d bytes left", sp+slen-fromp);
|
||||
rb_raise(rb_eArgError, "not fully converted, %td bytes left", sp+slen-fromp);
|
||||
}
|
||||
buf = (unsigned char *)RSTRING_PTR(dest);
|
||||
*bp = '\0';
|
||||
|
@ -358,7 +358,7 @@ str_transcode(int argc, VALUE *argv, VALUE *self)
|
|||
my_transcoding.ruby_string_dest = dest;
|
||||
(*my_transcoder->postprocessor)(&fromp, &bp, (sp+slen), (bp+blen), &my_transcoding);
|
||||
if (fromp != sp+slen) {
|
||||
rb_raise(rb_eArgError, "not fully converted, %d bytes left", sp+slen-fromp);
|
||||
rb_raise(rb_eArgError, "not fully converted, %td bytes left", sp+slen-fromp);
|
||||
}
|
||||
buf = (unsigned char *)RSTRING_PTR(dest);
|
||||
*bp = '\0';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue