diff options
| -rw-r--r-- | include/mruby/dump.h | 16 | ||||
| -rw-r--r-- | include/mruby/string.h | 1 | ||||
| -rw-r--r-- | mrbgems/mruby-struct/src/struct.c | 10 | ||||
| -rw-r--r-- | src/object.c | 2 | ||||
| -rw-r--r-- | src/variable.c | 2 |
5 files changed, 15 insertions, 16 deletions
diff --git a/include/mruby/dump.h b/include/mruby/dump.h index 02c5250c9..81f2af665 100644 --- a/include/mruby/dump.h +++ b/include/mruby/dump.h @@ -28,14 +28,14 @@ mrb_irep *mrb_read_irep(mrb_state*, const uint8_t*); * NOTE: MRB_DUMP_GENERAL_FAILURE is caused by * unspecified issues like malloc failed. */ -#define MRB_DUMP_OK 0 -#define MRB_DUMP_GENERAL_FAILURE -1 -#define MRB_DUMP_WRITE_FAULT -2 -#define MRB_DUMP_READ_FAULT -3 -#define MRB_DUMP_CRC_ERROR -4 -#define MRB_DUMP_INVALID_FILE_HEADER -5 -#define MRB_DUMP_INVALID_IREP -6 -#define MRB_DUMP_INVALID_ARGUMENT -7 +#define MRB_DUMP_OK 0 +#define MRB_DUMP_GENERAL_FAILURE (-1) +#define MRB_DUMP_WRITE_FAULT (-2) +#define MRB_DUMP_READ_FAULT (-3) +#define MRB_DUMP_CRC_ERROR (-4) +#define MRB_DUMP_INVALID_FILE_HEADER (-5) +#define MRB_DUMP_INVALID_IREP (-6) +#define MRB_DUMP_INVALID_ARGUMENT (-7) /* null symbol length */ #define MRB_DUMP_NULL_SYM_LEN 0xFFFF diff --git a/include/mruby/string.h b/include/mruby/string.h index fbc39368b..675dadb5c 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -37,7 +37,6 @@ struct RString { void mrb_gc_free_str(mrb_state*, struct RString*); void mrb_str_modify(mrb_state*, struct RString*); -mrb_value mrb_str_literal(mrb_state*, mrb_value); void mrb_str_concat(mrb_state*, mrb_value, mrb_value); mrb_value mrb_str_plus(mrb_state*, mrb_value, mrb_value); mrb_value mrb_ptr_to_str(mrb_state *, void*); diff --git a/mrbgems/mruby-struct/src/struct.c b/mrbgems/mruby-struct/src/struct.c index e6d3b0796..00a938dbf 100644 --- a/mrbgems/mruby-struct/src/struct.c +++ b/mrbgems/mruby-struct/src/struct.c @@ -450,7 +450,7 @@ inspect_struct(mrb_state *mrb, mrb_value s, int recur) mrb_str_append(mrb, str, mrb_str_new_cstr(mrb, cn)); } if (recur) { - return mrb_str_cat2(mrb, str, ":...>"); + return mrb_str_cat_cstr(mrb, str, ":...>"); } members = mrb_struct_members(mrb, s); @@ -462,10 +462,10 @@ inspect_struct(mrb_state *mrb, mrb_value s, int recur) mrb_sym id; if (i > 0) { - mrb_str_cat2(mrb, str, ", "); + mrb_str_cat_cstr(mrb, str, ", "); } else if (cn) { - mrb_str_cat2(mrb, str, " "); + mrb_str_cat_cstr(mrb, str, " "); } slot = ptr_members[i]; id = mrb_symbol(slot); @@ -479,10 +479,10 @@ inspect_struct(mrb_state *mrb, mrb_value s, int recur) else { mrb_str_append(mrb, str, mrb_inspect(mrb, slot)); } - mrb_str_cat2(mrb, str, "="); + mrb_str_cat_cstr(mrb, str, "="); mrb_str_append(mrb, str, mrb_inspect(mrb, ptr[i])); } - mrb_str_cat2(mrb, str, ">"); + mrb_str_cat_cstr(mrb, str, ">"); return str; } diff --git a/src/object.c b/src/object.c index c11a30055..172f2dbda 100644 --- a/src/object.c +++ b/src/object.c @@ -443,7 +443,7 @@ mrb_any_to_s(mrb_state *mrb, mrb_value obj) const char *cname = mrb_obj_classname(mrb, obj); mrb_str_buf_cat(mrb, str, "#<", 2); - mrb_str_cat2(mrb, str, cname); + mrb_str_cat_cstr(mrb, str, cname); mrb_str_cat(mrb, str, ":", 1); mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, mrb_cptr(obj))); mrb_str_buf_cat(mrb, str, ">", 1); diff --git a/src/variable.c b/src/variable.c index de56c3ce6..3dc562a5e 100644 --- a/src/variable.c +++ b/src/variable.c @@ -595,7 +595,7 @@ mrb_obj_iv_inspect(mrb_state *mrb, struct RObject *obj) mrb_value str = mrb_str_buf_new(mrb, 30); mrb_str_buf_cat(mrb, str, "-<", 2); - mrb_str_cat2(mrb, str, cn); + mrb_str_cat_cstr(mrb, str, cn); mrb_str_cat(mrb, str, ":", 1); mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, obj)); |