From 81a7e0cbe9851c2388e53950a6db3e75b1156ead Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 19 Nov 2016 17:02:18 +0000 Subject: Change some AllocVecs to mallocs and FreeVecs to free Need to be careful with ASPrintf --- frontends/amiga/clipboard.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'frontends/amiga/clipboard.c') diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c index 4933f59e7..73f471fda 100644 --- a/frontends/amiga/clipboard.c +++ b/frontends/amiga/clipboard.c @@ -45,7 +45,6 @@ #include "amiga/iff_cset.h" #include "amiga/iff_dr2d.h" #include "amiga/menu.h" -#include "amiga/memory.h" #include "amiga/utf8.h" #define ID_UTF8 MAKE_ID('U','T','F','8') @@ -114,10 +113,10 @@ static char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codese case 0: if(ci_new) { - ci_next->ci_Next = ami_misc_allocvec_clear(sizeof(struct CollectionItem), 0); + ci_next->ci_Next = calloc(1, sizeof(struct CollectionItem)); ci_next = ci_next->ci_Next; } else { - ci_new = ami_misc_allocvec_clear(sizeof(struct CollectionItem), 0); + ci_new = calloc(1, sizeof(struct CollectionItem)); ci_next = ci_new; } @@ -128,10 +127,10 @@ static char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codese default: if(ci_new) { - ci_next->ci_Next = ami_misc_allocvec_clear(sizeof(struct CollectionItem), 0); + ci_next->ci_Next = calloc(1, sizeof(struct CollectionItem), 0); ci_next = ci_next->ci_Next; } else { - ci_new = ami_misc_allocvec_clear(sizeof(struct CollectionItem), 0); + ci_new = calloc(1, sizeof(struct CollectionItem), 0); ci_next = ci_new; } @@ -166,7 +165,7 @@ static char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codese if(ci_new) { free(ci_curr->ci_Data); - FreeVec(ci_curr); + free(ci_curr); } } while ((ci_curr = ci_next)); -- cgit v1.2.3