diff options
| author | Kenta Murata <mrkn@mrkn.jp> | 2020-12-23 00:33:24 +0900 |
|---|---|---|
| committer | Kenta Murata <mrkn@mrkn.jp> | 2020-12-23 09:24:53 +0900 |
| commit | 74652e640a3ef50eb5442eb98438e3d634a4faf7 (patch) | |
| tree | 9b38e5df4f471929d195ea5eee8a5581d2ce5cde /ext | |
| parent | 05014dcb887681d986105653ab527da2c4ff7774 (diff) | |
| download | ruby-74652e640a3ef50eb5442eb98438e3d634a4faf7.tar.gz | |
[memory_view][fiddle] Rename len to byte_size in rb_memory_view_t
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/-test-/memory_view/memory_view.c | 6 | ||||
| -rw-r--r-- | ext/fiddle/memory_view.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ext/-test-/memory_view/memory_view.c b/ext/-test-/memory_view/memory_view.c index 00572b9109..c847eac98a 100644 --- a/ext/-test-/memory_view/memory_view.c +++ b/ext/-test-/memory_view/memory_view.c @@ -12,7 +12,7 @@ static VALUE sym_offset; static VALUE sym_size; static VALUE sym_repeat; static VALUE sym_obj; -static VALUE sym_len; +static VALUE sym_byte_size; static VALUE sym_readonly; static VALUE sym_format; static VALUE sym_item_size; @@ -122,7 +122,7 @@ memory_view_get_memory_view_info(VALUE mod, VALUE obj) VALUE hash = rb_hash_new(); rb_hash_aset(hash, sym_obj, view.obj); - rb_hash_aset(hash, sym_len, SSIZET2NUM(view.len)); + rb_hash_aset(hash, sym_byte_size, SSIZET2NUM(view.byte_size)); rb_hash_aset(hash, sym_readonly, view.readonly ? Qtrue : Qfalse); rb_hash_aset(hash, sym_format, view.format ? rb_str_new_cstr(view.format) : Qnil); rb_hash_aset(hash, sym_item_size, SSIZET2NUM(view.item_size)); @@ -398,7 +398,7 @@ Init_memory_view(void) sym_size = ID2SYM(rb_intern_const("size")); sym_repeat = ID2SYM(rb_intern_const("repeat")); sym_obj = ID2SYM(rb_intern_const("obj")); - sym_len = ID2SYM(rb_intern_const("len")); + sym_byte_size = ID2SYM(rb_intern_const("byte_size")); sym_readonly = ID2SYM(rb_intern_const("readonly")); sym_format = ID2SYM(rb_intern_const("format")); sym_item_size = ID2SYM(rb_intern_const("item_size")); diff --git a/ext/fiddle/memory_view.c b/ext/fiddle/memory_view.c index 819a8bd95d..172b1f18fc 100644 --- a/ext/fiddle/memory_view.c +++ b/ext/fiddle/memory_view.c @@ -48,7 +48,7 @@ static size_t fiddle_memview_memsize(const void *ptr) { const struct memview_data *data = ptr; - return sizeof(*data) + sizeof(rb_memory_view_item_component_t)*data->n_members + (size_t)data->view.len; + return sizeof(*data) + sizeof(rb_memory_view_item_component_t)*data->n_members + (size_t)data->view.byte_size; } static const rb_data_type_t fiddle_memview_data_type = { @@ -90,13 +90,13 @@ rb_fiddle_memview_get_obj(VALUE obj) } static VALUE -rb_fiddle_memview_get_length(VALUE obj) +rb_fiddle_memview_get_byte_size(VALUE obj) { struct memview_data *data; TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data); if (NIL_P(data->view.obj)) return Qnil; - return SSIZET2NUM(data->view.len); + return SSIZET2NUM(data->view.byte_size); } static VALUE @@ -240,7 +240,7 @@ Init_fiddle_memory_view(void) rb_define_alloc_func(rb_cMemoryView, rb_fiddle_memview_s_allocate); rb_define_method(rb_cMemoryView, "initialize", rb_fiddle_memview_initialize, 1); rb_define_method(rb_cMemoryView, "obj", rb_fiddle_memview_get_obj, 0); - rb_define_method(rb_cMemoryView, "length", rb_fiddle_memview_get_length, 0); + rb_define_method(rb_cMemoryView, "byte_size", rb_fiddle_memview_get_byte_size, 0); rb_define_method(rb_cMemoryView, "readonly?", rb_fiddle_memview_get_readonly, 0); rb_define_method(rb_cMemoryView, "format", rb_fiddle_memview_get_format, 0); rb_define_method(rb_cMemoryView, "item_size", rb_fiddle_memview_get_item_size, 0); |