diff options
| author | Peter Zhu <peter@peterzhu.ca> | 2021-04-26 19:14:57 +0000 |
|---|---|---|
| committer | Peter Zhu <peter@peterzhu.ca> | 2021-04-26 19:26:50 -0400 |
| commit | 4f88acc8333218429fddbff2fbbba5152bf00eb7 (patch) | |
| tree | 592dea194a2b7f3b8558d0f29a5504138c731e41 /ext/objspace/objspace_dump.c | |
| parent | 6c1e9650893a855fadba456ca15feaaec4c43c6f (diff) | |
Fix compiler warnings in objspace_dump.c when assertions are turned on
Example:
```
In file included from ../../../include/ruby/defines.h:72,
from ../../../include/ruby/ruby.h:23,
from ../../../gc.h:3,
from ../../../ext/objspace/objspace_dump.c:15:
../../../ext/objspace/objspace_dump.c: In function ‘dump_append_ld’:
../../../ext/objspace/objspace_dump.c:95:26: warning: comparison of integer expressions of different signedness: ‘long unsigned int’ and ‘int’ [-Wsign-compare]
95 | RUBY_ASSERT(required <= width);
| ^~
```
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4417
Diffstat (limited to 'ext/objspace/objspace_dump.c')
| -rw-r--r-- | ext/objspace/objspace_dump.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c index c3619a9656..cf7acb5c6f 100644 --- a/ext/objspace/objspace_dump.c +++ b/ext/objspace/objspace_dump.c @@ -89,7 +89,7 @@ static void buffer_append(struct dump_config *dc, const char *cstr, unsigned lon static void dump_append_ld(struct dump_config *dc, const long number) { - const int width = DECIMAL_SIZE_OF_BITS(sizeof(number) * CHAR_BIT - 1) + 2; + const unsigned int width = DECIMAL_SIZE_OF_BITS(sizeof(number) * CHAR_BIT - 1) + 2; buffer_ensure_capa(dc, width); unsigned long required = snprintf(dc->buffer + dc->buffer_len, width, "%ld", number); RUBY_ASSERT(required <= width); @@ -99,7 +99,7 @@ dump_append_ld(struct dump_config *dc, const long number) static void dump_append_lu(struct dump_config *dc, const unsigned long number) { - const int width = DECIMAL_SIZE_OF_BITS(sizeof(number) * CHAR_BIT) + 1; + const unsigned int width = DECIMAL_SIZE_OF_BITS(sizeof(number) * CHAR_BIT) + 1; buffer_ensure_capa(dc, width); unsigned long required = snprintf(dc->buffer + dc->buffer_len, width, "%lu", number); RUBY_ASSERT(required <= width); @@ -123,7 +123,7 @@ dump_append_g(struct dump_config *dc, const double number) static void dump_append_d(struct dump_config *dc, const int number) { - const int width = DECIMAL_SIZE_OF_BITS(sizeof(number) * CHAR_BIT - 1) + 2; + const unsigned int width = DECIMAL_SIZE_OF_BITS(sizeof(number) * CHAR_BIT - 1) + 2; buffer_ensure_capa(dc, width); unsigned long required = snprintf(dc->buffer + dc->buffer_len, width, "%d", number); RUBY_ASSERT(required <= width); @@ -133,7 +133,7 @@ dump_append_d(struct dump_config *dc, const int number) static void dump_append_sizet(struct dump_config *dc, const size_t number) { - const int width = DECIMAL_SIZE_OF_BITS(sizeof(number) * CHAR_BIT) + 1; + const unsigned int width = DECIMAL_SIZE_OF_BITS(sizeof(number) * CHAR_BIT) + 1; buffer_ensure_capa(dc, width); unsigned long required = snprintf(dc->buffer + dc->buffer_len, width, "%"PRIuSIZE, number); RUBY_ASSERT(required <= width); @@ -144,7 +144,7 @@ static void dump_append_c(struct dump_config *dc, char c) { if (c <= 0x1f) { - const int width = (sizeof(c) * CHAR_BIT / 4) + 5; + const unsigned int width = (sizeof(c) * CHAR_BIT / 4) + 5; buffer_ensure_capa(dc, width); unsigned long required = snprintf(dc->buffer + dc->buffer_len, width, "\\u00%02x", c); RUBY_ASSERT(required <= width); |