diff options
Diffstat (limited to 'src/base/string/make.c')
| -rw-r--r-- | src/base/string/make.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/base/string/make.c b/src/base/string/make.c index d1e594a..50b8b98 100644 --- a/src/base/string/make.c +++ b/src/base/string/make.c @@ -9,7 +9,7 @@ string·makecap(byte *s, vlong len, vlong cap) struct Hdr* h; h = malloc(sizeof(*h) + cap + 1); - if(s == nil) memset(h, 0, sizeof(*h)); + if(s == nil) mem·set(h, sizeof(*h), 0); if(h == nil) return nil; // Allocation failed. @@ -19,8 +19,8 @@ string·makecap(byte *s, vlong len, vlong cap) if(cap < h->len) goto cleanup; if(s != nil && cap > 0){ - memcpy(h->buf, s, h->len); - memset(h->buf + h->len, '\0', h->cap - h->len + 1); + mem·copy(h->buf, h->len, s); + mem·set(h->buf + h->len, h->cap - h->len + 1, '\0'); } return h->buf; @@ -36,7 +36,7 @@ cleanup: string string·makelen(byte *s, vlong len) { - vlong sl = (!s) ? 0 : strlen(s); + vlong sl = (!s) ? 0 : str·len(s); if(sl < len) panicf("attempted to take a bigger substring than string length"); vlong cap = (len == 0) ? 1 : len; @@ -48,6 +48,6 @@ string·makelen(byte *s, vlong len) string string·make(byte *s) { - vlong len = (!s) ? 0 : strlen(s); + vlong len = (!s) ? 0 : str·len(s); return string·makelen(s, len); } |