github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

foreach.c: printf specifier 

* ext/-test-/st/foreach/foreach.c: get rid of hard coded "%lu",
  since st_data_t depends on the platforms.  use PRIuVALUE with
  casting VALUE instead since there is no specifier for it.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-11-03 05:36:18 +00:00
Родитель af97388bc4
Коммит 2320264ef6
1 изменённых файлов: 10 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
ext/-test-/st/foreach/foreach.c
Просмотреть файл

@ -24,10 +24,10 @@ force_unpack_check(struct checker *c, st_data_t key, st_data_t val)
} }
if (key != c->nr) { if (key != c->nr) {
rb_bug("unexpected key: %lu (expected %lu)\n", key, c->nr); rb_bug("unexpected key: %"PRIuVALUE" (expected %"PRIuVALUE")\n", (VALUE)key, (VALUE)c->nr);
} }
if (val != c->nr) { if (val != c->nr) {
rb_bug("unexpected val: %lu (expected %lu)\n", val, c->nr); rb_bug("unexpected val: %"PRIuVALUE" (expected %"PRIuVALUE")\n", (VALUE)val, (VALUE)c->nr);
} }
c->nr++; c->nr++;
@ -63,7 +63,7 @@ unp_fec_i(st_data_t key, st_data_t val, st_data_t args, int error)
rb_bug("failed to delete\n"); rb_bug("failed to delete\n");
} }
if (v != 0) { if (v != 0) {
rb_bug("unexpected value deleted: %lu (expected 0)", v); rb_bug("unexpected value deleted: %"PRIuVALUE" (expected 0)", (VALUE)v);
} }
} }
return ST_CHECK; return ST_CHECK;
@ -90,12 +90,12 @@ unp_fec(VALUE self, VALUE test)
if (c.test == ID2SYM(rb_intern("delete2"))) { if (c.test == ID2SYM(rb_intern("delete2"))) {
if (c.nr != 1) { if (c.nr != 1) {
rb_bug("mismatched iteration: %lu (expected 1)\n", c.nr); rb_bug("mismatched iteration: %"PRIuVALUE" (expected 1)\n", (VALUE)c.nr);
} }
} }
else if (c.nr != expect_size) { else if (c.nr != expect_size) {
rb_bug("mismatched iteration: %lu (expected %lu)\n", rb_bug("mismatched iteration: %"PRIuVALUE" (expected %"PRIuVALUE")\n",
c.nr, expect_size); (VALUE)c.nr, (VALUE)expect_size);
} }
if (tbl->entries_packed) rb_bug("should be unpacked\n"); if (tbl->entries_packed) rb_bug("should be unpacked\n");
@ -123,7 +123,7 @@ unp_fe_i(st_data_t key, st_data_t val, st_data_t args, int error)
rb_bug("failed to delete\n"); rb_bug("failed to delete\n");
} }
if (v != 0) { if (v != 0) {
rb_bug("unexpected value deleted: %lu (expected 0)", v); rb_bug("unexpected value deleted: %"PRIuVALUE" (expected 0)", (VALUE)v);
} }
return ST_CONTINUE; return ST_CONTINUE;
} }
@ -151,12 +151,12 @@ unp_fe(VALUE self, VALUE test)
if (c.test == ID2SYM(rb_intern("unpack_delete"))) { if (c.test == ID2SYM(rb_intern("unpack_delete"))) {
if (c.nr != 1) { if (c.nr != 1) {
rb_bug("mismatched iteration: %lu (expected 1)\n", c.nr); rb_bug("mismatched iteration: %"PRIuVALUE" (expected 1)\n", (VALUE)c.nr);
} }
} }
else if (c.nr != expect_size) { else if (c.nr != expect_size) {
rb_bug("mismatched iteration: %lu (expected %lu)\n", rb_bug("mismatched iteration: %"PRIuVALUE" (expected %"PRIuVALUE"o)\n",
c.nr, expect_size); (VALUE)c.nr, (VALUE)expect_size);
} }
if (tbl->entries_packed) rb_bug("should be unpacked\n"); if (tbl->entries_packed) rb_bug("should be unpacked\n");