aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-09-13 03:03:27 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-09-13 21:29:08 +0900
commitbe857a19108adb37869ad196d65b90810807dec6 (patch)
treef432289b1af10e0c7451485719d4a6ef4dd3416e
parent9312d98801e376223b55361631bcde1f0a8f908f (diff)
downloadruby-be857a19108adb37869ad196d65b90810807dec6.tar.gz
Use PRIuSIZE format specifier for size_t values
Use PRIuSIZE instead of PRIdSIZE. This fixes the exception message shown on too large xmalloc2. This commit also fixes other incorrect use of PRIdSIZE in other functions; most of them are debug print. * gc.c (heap_extend_pages, get_envparam_size, ruby_malloc_size_overflow, gc_profile_dump_on): Use PRIuSIZE instead of PRIdSIZE as the passed value is size_t, not ssize_t. * iseq.c (get_line_info, rb_iseq_disasm_insn): Ditto. * sprintf.c (rb_str_format): Ditto. * thread_win32.c (native_thread_create): Ditto. * vm.c (get_param): Ditto. * ext/objspace/objspace_dump.c (dump_append_string_content, dump_object): Ditto. * ext/socket/raddrinfo.c (host_str, port_str): Ditto.
-rw-r--r--ext/objspace/objspace_dump.c4
-rw-r--r--ext/socket/raddrinfo.c4
-rw-r--r--gc.c14
-rw-r--r--iseq.c10
-rw-r--r--sprintf.c2
-rw-r--r--thread_win32.c2
-rw-r--r--vm.c2
7 files changed, 19 insertions, 19 deletions
diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c
index 47aaaf2..0dd3a9e 100644
--- a/ext/objspace/objspace_dump.c
+++ b/ext/objspace/objspace_dump.c
@@ -182,7 +182,7 @@ dump_append_string_content(struct dump_config *dc, VALUE obj)
{
dump_append(dc, ", \"bytesize\":%ld", RSTRING_LEN(obj));
if (!STR_EMBED_P(obj) && !STR_SHARED_P(obj) && (long)rb_str_capacity(obj) != RSTRING_LEN(obj))
- dump_append(dc, ", \"capacity\":%"PRIdSIZE, rb_str_capacity(obj));
+ dump_append(dc, ", \"capacity\":%"PRIuSIZE, rb_str_capacity(obj));
if (is_ascii_string(obj)) {
dump_append(dc, ", \"value\":");
@@ -248,7 +248,7 @@ dump_object(VALUE obj, struct dump_config *dc, int part)
break;
case T_HASH:
- dump_append(dc, ", \"size\":%"PRIdSIZE, (size_t)RHASH_SIZE(obj));
+ dump_append(dc, ", \"size\":%"PRIuSIZE, (size_t)RHASH_SIZE(obj));
if (FL_TEST(obj, HASH_PROC_DEFAULT))
dump_append(dc, ", \"default\":\"%p\"", (void *)RHASH_IFNONE(obj));
break;
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
index 11f5d1f..67bc9c2 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -462,7 +462,7 @@ host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
}
else if (len >= hbuflen) {
- rb_raise(rb_eArgError, "hostname too long (%"PRIdSIZE")",
+ rb_raise(rb_eArgError, "hostname too long (%"PRIuSIZE")",
len);
}
else {
@@ -493,7 +493,7 @@ port_str(VALUE port, char *pbuf, size_t pbuflen, int *flags_ptr)
SafeStringValueCStr(port);
RSTRING_GETMEM(port, serv, len);
if (len >= pbuflen) {
- rb_raise(rb_eArgError, "service name too long (%"PRIdSIZE")",
+ rb_raise(rb_eArgError, "service name too long (%"PRIuSIZE")",
len);
}
memcpy(pbuf, serv, len);
diff --git a/gc.c b/gc.c
index 18414ed..af43b04 100644
--- a/gc.c
+++ b/gc.c
@@ -1628,9 +1628,9 @@ heap_extend_pages(rb_objspace_t *objspace, size_t free_slots, size_t total_slots
if (0) {
fprintf(stderr,
- "free_slots(%8"PRIdSIZE")/total_slots(%8"PRIdSIZE")=%1.2f,"
+ "free_slots(%8"PRIuSIZE")/total_slots(%8"PRIuSIZE")=%1.2f,"
" G(%1.2f), f(%1.2f),"
- " used(%8"PRIdSIZE") => next_used(%8"PRIdSIZE")\n",
+ " used(%8"PRIuSIZE") => next_used(%8"PRIuSIZE")\n",
free_slots, total_slots, free_slots/(double)total_slots,
goal_ratio, f, used, next_used);
}
@@ -7340,14 +7340,14 @@ get_envparam_size(const char *name, size_t *default_value, size_t lower_bound)
}
if (val > 0 && (size_t)val > lower_bound) {
if (RTEST(ruby_verbose)) {
- fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIdSIZE")\n", name, val, *default_value);
+ fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIuSIZE")\n", name, val, *default_value);
}
*default_value = (size_t)val;
return 1;
}
else {
if (RTEST(ruby_verbose)) {
- fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIdSIZE") is ignored because it must be greater than %"PRIdSIZE".\n",
+ fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIuSIZE") is ignored because it must be greater than %"PRIuSIZE".\n",
name, val, *default_value, lower_bound);
}
return 0;
@@ -7916,7 +7916,7 @@ void
ruby_malloc_size_overflow(size_t count, size_t elsize)
{
rb_raise(rb_eArgError,
- "malloc: possible integer overflow (%"PRIdSIZE"*%"PRIdSIZE")",
+ "malloc: possible integer overflow (%"PRIuSIZE"*%"PRIuSIZE")",
count, elsize);
}
@@ -8901,7 +8901,7 @@ gc_profile_dump_on(VALUE out, VALUE (*append)(VALUE, VALUE))
for (i = 0; i < count; i++) {
record = &objspace->profile.records[i];
- append(out, rb_sprintf("%5"PRIdSIZE" %19.3f %20"PRIuSIZE" %20"PRIuSIZE" %20"PRIuSIZE" %30.20f\n",
+ append(out, rb_sprintf("%5"PRIuSIZE" %19.3f %20"PRIuSIZE" %20"PRIuSIZE" %20"PRIuSIZE" %30.20f\n",
i+1, record->gc_invoke_time, record->heap_use_size,
record->heap_total_size, record->heap_total_objects, record->gc_time*1000));
}
@@ -8925,7 +8925,7 @@ gc_profile_dump_on(VALUE out, VALUE (*append)(VALUE, VALUE))
for (i = 0; i < count; i++) {
record = &objspace->profile.records[i];
- append(out, rb_sprintf("%5"PRIdSIZE" %4s/%c/%6s%c %13"PRIuSIZE" %15"PRIuSIZE
+ append(out, rb_sprintf("%5"PRIuSIZE" %4s/%c/%6s%c %13"PRIuSIZE" %15"PRIuSIZE
#if CALC_EXACT_MALLOC_SIZE
" %15"PRIuSIZE
#endif
diff --git a/iseq.c b/iseq.c
index b6b31c0..1e4656b 100644
--- a/iseq.c
+++ b/iseq.c
@@ -1176,8 +1176,8 @@ get_line_info(const rb_iseq_t *iseq, size_t pos)
const int debug = 0;
if (debug) {
- printf("size: %"PRIdSIZE"\n", size);
- printf("table[%"PRIdSIZE"]: position: %d, line: %d, pos: %"PRIdSIZE"\n",
+ printf("size: %"PRIuSIZE"\n", size);
+ printf("table[%"PRIuSIZE"]: position: %d, line: %d, pos: %"PRIuSIZE"\n",
i, table[i].position, table[i].line_no, pos);
}
@@ -1189,7 +1189,7 @@ get_line_info(const rb_iseq_t *iseq, size_t pos)
}
else {
for (i=1; i<size; i++) {
- if (debug) printf("table[%"PRIdSIZE"]: position: %d, line: %d, pos: %"PRIdSIZE"\n",
+ if (debug) printf("table[%"PRIuSIZE"]: position: %d, line: %d, pos: %"PRIuSIZE"\n",
i, table[i].position, table[i].line_no, pos);
if (table[i].position == pos) {
@@ -1397,10 +1397,10 @@ rb_iseq_disasm_insn(VALUE ret, const VALUE *code, size_t pos,
insn_name_buff = insn_name(insn);
if (1) {
- rb_str_catf(str, "%04"PRIdSIZE" %-16s ", pos, insn_name_buff);
+ rb_str_catf(str, "%04"PRIuSIZE" %-16s ", pos, insn_name_buff);
}
else {
- rb_str_catf(str, "%04"PRIdSIZE" %-16.*s ", pos,
+ rb_str_catf(str, "%04"PRIuSIZE" %-16.*s ", pos,
(int)strcspn(insn_name_buff, "_"), insn_name_buff);
}
diff --git a/sprintf.c b/sprintf.c
index c6afb0d..5884926 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -602,7 +602,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
const int message_limit = 20;
len = (int)(rb_enc_right_char_head(start, start + message_limit, p, enc) - start);
rb_enc_raise(enc, rb_eArgError,
- "too long name (%"PRIdSIZE" bytes) - %.*s...%c",
+ "too long name (%"PRIuSIZE" bytes) - %.*s...%c",
(size_t)(p - start - 2), len, start, term);
}
#endif
diff --git a/thread_win32.c b/thread_win32.c
index 5d0c493..01d58a2 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -614,7 +614,7 @@ native_thread_create(rb_thread_t *th)
if (THREAD_DEBUG) {
Sleep(0);
- thread_debug("create: (th: %p, thid: %p, intr: %p), stack size: %"PRIdSIZE"\n",
+ thread_debug("create: (th: %p, thid: %p, intr: %p), stack size: %"PRIuSIZE"\n",
th, th->thread_id,
th->native_thread_data.interrupt_event, stack_size);
}
diff --git a/vm.c b/vm.c
index 74226d7..f3086d8 100644
--- a/vm.c
+++ b/vm.c
@@ -2185,7 +2185,7 @@ get_param(const char *name, size_t default_value, size_t min_value)
}
result = (size_t)(((val -1 + RUBY_VM_SIZE_ALIGN) / RUBY_VM_SIZE_ALIGN) * RUBY_VM_SIZE_ALIGN);
}
- if (0) fprintf(stderr, "%s: %"PRIdSIZE"\n", name, result); /* debug print */
+ if (0) fprintf(stderr, "%s: %"PRIuSIZE"\n", name, result); /* debug print */
return result;
}