1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* iseq.c (insn_operand_intern, rb_iseq_disasm): fix format specifiers.

* vm.c (thread_free): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-10-13 14:07:22 +00:00
parent 9d0c732f0d
commit e69bba13a0
3 changed files with 9 additions and 5 deletions

View file

@ -1,4 +1,8 @@
Wed Oct 13 22:53:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
Wed Oct 13 23:07:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* iseq.c (insn_operand_intern, rb_iseq_disasm): fix format specifiers.
* vm.c (thread_free): ditto.
* numeric.c (check_uint): get rid of overflow on LLP64 platforms.

6
iseq.c
View file

@ -739,11 +739,11 @@ insn_operand_intern(rb_iseq_t *iseq,
switch (type) {
case TS_OFFSET: /* LONG */
ret = rb_sprintf("%ld", pos + len + op);
ret = rb_sprintf("%"PRIdSIZE, pos + len + op);
break;
case TS_NUM: /* ULONG */
ret = rb_sprintf("%lu", op);
ret = rb_sprintf("%"PRIuVALUE, op);
break;
case TS_LINDEX:
@ -985,7 +985,7 @@ rb_iseq_disasm(VALUE self)
int argc = iseqdat->argc;
int opts = iseqdat->arg_opts;
if (i >= argc && i < argc + opts - 1) {
snprintf(opti, sizeof(opti), "Opt=%ld",
snprintf(opti, sizeof(opti), "Opt=%"PRIdVALUE,
iseqdat->arg_opt_table[i - argc]);
}
}

2
vm.c
View file

@ -1699,7 +1699,7 @@ thread_free(void *ptr)
}
if (th->locking_mutex != Qfalse) {
rb_bug("thread_free: locking_mutex must be NULL (%p:%ld)", (void *)th, th->locking_mutex);
rb_bug("thread_free: locking_mutex must be NULL (%p:%p)", (void *)th, (void *)th->locking_mutex);
}
if (th->keeping_mutexes != NULL) {
rb_bug("thread_free: keeping_mutexes must be NULL (%p:%p)", (void *)th, (void *)th->keeping_mutexes);