admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

inline str_discard(); ref #2370

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-06-07 16:51:40 +09:00
parent 24b02955d3
commit 20dc629b11
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+5 -12
View File
@@ -2523,17 +2523,6 @@ mrb_str_bytes(mrb_state *mrb, mrb_value str)
return a;
}
static inline void
str_discard(mrb_state *mrb, mrb_value str) {
struct RString *s = mrb_str_ptr(str);
if (!STR_SHARED_P(s) && !STR_EMBED_P(s) && ((s->flags & MRB_STR_NOFREE) == 0)) {
mrb_free(mrb, s->as.heap.ptr);
RSTRING(str)->as.heap.ptr = 0;
RSTRING(str)->as.heap.len = 0;
}
}
/*
* call-seq:
* string.clear -> string
@@ -2548,7 +2537,11 @@ mrb_str_clear(mrb_state *mrb, mrb_value str)
{
struct RString *s = mrb_str_ptr(str);
str_discard(mrb, str);
if (!STR_SHARED_P(s) && !STR_EMBED_P(s) && ((s->flags & MRB_STR_NOFREE) == 0)) {
mrb_free(mrb, s->as.heap.ptr);
RSTRING(str)->as.heap.ptr = 0;
RSTRING(str)->as.heap.len = 0;
}
STR_SET_EMBED_FLAG(s);
STR_SET_EMBED_LEN(s, 0);
RSTRING_PTR(str)[0] = '\0';