diff options
author | Koichi Sasada <[email protected]> | 2019-11-08 16:16:25 +0900 |
---|---|---|
committer | Koichi Sasada <[email protected]> | 2019-11-08 16:16:25 +0900 |
commit | 83c563cfa403af1141fc0080d2b6eec344db6726 (patch) | |
tree | 3f23c2067f4e03d78c1f516fb39a4bc24c7ac758 | |
parent | 0b29662606bb80762d58938e847441020301406f (diff) |
cstr -> bytes
rb_iseq_ibf_load_cstr() accepts bytes, but not NUL-terminate
C string. To make it clear, rename it to _bytes.
-rw-r--r-- | builtin.c | 2 | ||||
-rw-r--r-- | compile.c | 10 | ||||
-rw-r--r-- | iseq.h | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -26,7 +26,7 @@ rb_load_with_builtin_functions(const char *feature_name, const char *fname, cons // load binary GET_VM()->builtin_function_table = table; - const rb_iseq_t *iseq = rb_iseq_ibf_load_cstr((const char *)bin, size); + const rb_iseq_t *iseq = rb_iseq_ibf_load_bytes((const char *)bin, size); GET_VM()->builtin_function_table = NULL; // exec @@ -11426,10 +11426,10 @@ ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq) } static void -ibf_load_setup_cstr(struct ibf_load *load, VALUE loader_obj, const char *cstr, size_t size) +ibf_load_setup_bytes(struct ibf_load *load, VALUE loader_obj, const char *bytes, size_t size) { load->loader_obj = loader_obj; - load->global_buffer.buff = cstr; + load->global_buffer.buff = bytes; load->header = (struct ibf_header *)load->global_buffer.buff; load->global_buffer.size = load->header->size; load->global_buffer.obj_list_offset = load->header->global_object_list_offset; @@ -11478,7 +11478,7 @@ ibf_load_setup(struct ibf_load *load, VALUE loader_obj, VALUE str) str = rb_str_new(RSTRING_PTR(str), RSTRING_LEN(str)); #endif - ibf_load_setup_cstr(load, loader_obj, StringValuePtr(str), RSTRING_LEN(str)); + ibf_load_setup_bytes(load, loader_obj, StringValuePtr(str), RSTRING_LEN(str)); RB_OBJ_WRITE(loader_obj, &load->str, str); } @@ -11525,13 +11525,13 @@ rb_iseq_ibf_load(VALUE str) } const rb_iseq_t * -rb_iseq_ibf_load_cstr(const char *cstr, size_t size) +rb_iseq_ibf_load_bytes(const char *bytes, size_t size) { struct ibf_load *load; rb_iseq_t *iseq; VALUE loader_obj = TypedData_Make_Struct(0, struct ibf_load, &ibf_load_type, load); - ibf_load_setup_cstr(load, loader_obj, cstr, size); + ibf_load_setup_bytes(load, loader_obj, bytes, size); iseq = ibf_load_iseq(load, 0); RB_GC_GUARD(loader_obj); @@ -156,7 +156,7 @@ iseq_imemo_alloc(void) VALUE rb_iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt); void rb_ibf_load_iseq_complete(rb_iseq_t *iseq); const rb_iseq_t *rb_iseq_ibf_load(VALUE str); -const rb_iseq_t *rb_iseq_ibf_load_cstr(const char *cstr, size_t); +const rb_iseq_t *rb_iseq_ibf_load_bytes(const char *cstr, size_t); VALUE rb_iseq_ibf_load_extra_data(VALUE str); void rb_iseq_init_trace(rb_iseq_t *iseq); int rb_iseq_add_local_tracepoint_recursively(const rb_iseq_t *iseq, rb_event_flag_t turnon_events, VALUE tpval, unsigned int target_line); |