Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-06 12:10:13 +01:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

Change memory allocation API to require size for free and realloc.

Browse Source
This commit is contained in:
Damien
2013-12-29 19:33:23 +00:00
parent a1c8e5737c
commit 732407f1bf
22 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
py/vstr.c
View File

@@ -11,7 +11,6 @@ void vstr_init(vstr_t *vstr) {
vstr->len = 0;
vstr->buf = m_new(char, vstr->alloc);
if (vstr->buf == NULL) {
m_free(vstr);
vstr->had_error = true;
return;
}
@@ -20,7 +19,7 @@ void vstr_init(vstr_t *vstr) {
}
void vstr_clear(vstr_t *vstr) {
m_free(vstr->buf);
m_del(char, vstr->buf, vstr->alloc);
vstr->buf = NULL;
}
@@ -35,8 +34,8 @@ vstr_t *vstr_new(void) {
void vstr_free(vstr_t *vstr) {
if (vstr != NULL) {
m_free(vstr->buf);
m_free(vstr);
m_del(char, vstr->buf, vstr->alloc);
m_del_obj(vstr_t, vstr);
}
}
@@ -67,7 +66,7 @@ int vstr_len(vstr_t *vstr) {
bool vstr_ensure_extra(vstr_t *vstr, int size) {
if (vstr->len + size + 1 > vstr->alloc) {
int new_alloc = ROUND_ALLOC((vstr->len + size + 1) * 2);
char *new_buf = m_renew(char, vstr->buf, new_alloc);
char *new_buf = m_renew(char, vstr->buf, vstr->alloc, new_alloc);
if (new_buf == NULL) {
vstr->had_error = true;
return false;