nobu	2010-10-13 23:07:22 +0900 (Wed, 13 Oct 2010)

  New Revision: 29487

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29487

  Log:
    * iseq.c (insn_operand_intern, rb_iseq_disasm): fix format specifiers.
    
    * vm.c (thread_free): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/iseq.c
    trunk/vm.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29486)
+++ ChangeLog	(revision 29487)
@@ -1,5 +1,9 @@
-Wed Oct 13 22:53:19 2010  Nobuyoshi Nakada  <nobu@r...>
+Wed Oct 13 23:07:19 2010  Nobuyoshi Nakada  <nobu@r...>
 
+	* 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.
 
 	* insns.def (opt_case_dispatch): use st_data_t.
Index: iseq.c
===================================================================
--- iseq.c	(revision 29486)
+++ iseq.c	(revision 29487)
@@ -739,11 +739,11 @@
 
     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 @@
 		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]);
 		}
 	    }
Index: vm.c
===================================================================
--- vm.c	(revision 29486)
+++ vm.c	(revision 29487)
@@ -1699,7 +1699,7 @@
 	}
 
 	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);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/