Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: use MEM_recallocN_id

Browse Source
This commit is contained in:
Campbell Barton
2020-03-06 12:00:37 +11:00
parent 8574d68aa0
commit c19d2f2507
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/bmesh/intern/bmesh_operators.c
View File

@@ -740,11 +740,7 @@ void *bmo_slot_buffer_grow(BMesh *bm, BMOperator *op, int slot_code, int totadd)
allocsize = BMO_OPSLOT_TYPEINFO[bmo_opdefines[op->type]->slot_types[slot_code].type] * allocsize = BMO_OPSLOT_TYPEINFO[bmo_opdefines[op->type]->slot_types[slot_code].type] *
slot->size; slot->size;
slot->data.buf = MEM_recallocN_id(slot->data.buf, allocsize, "opslot dynamic array");
tmp = slot->data.buf;
slot->data.buf = MEM_callocN(allocsize, "opslot dynamic array");
memcpy(slot->data.buf, tmp, allocsize);
MEM_freeN(tmp);
} }
slot->len += totadd; slot->len += totadd;

6
source/blender/editors/space_console/console_ops.c
View File

@@ -233,11 +233,7 @@ static void console_line_verify_length(ConsoleLine *ci, int len)
#else #else
int new_len = (len + 1) * 2; int new_len = (len + 1) * 2;
#endif #endif
char *new_line = MEM_callocN(new_len, "console line"); ci->line = MEM_recallocN_id(ci->line, new_len, "console line");
memcpy(new_line, ci->line, ci->len);
MEM_freeN(ci->line);
ci->line = new_line;
ci->len_alloc = new_len; ci->len_alloc = new_len;
} }
} }