diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 22:01:25 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 22:01:25 +0000 |
| commit | 3ab8032f1679c2a3526ccd458eb130c0d0f917bc (patch) | |
| tree | 7411a9e07adfb98dd03df5cac60209925b6230a7 /frontends/amiga/gui_options.c | |
| parent | faf4c1fb6012941134046db14370f60748184b05 (diff) | |
| parent | eab6c0c99e29e10a3ac409b8de7c0e39ef918358 (diff) | |
| download | netsurf-3ab8032f1679c2a3526ccd458eb130c0d0f917bc.tar.gz netsurf-3ab8032f1679c2a3526ccd458eb130c0d0f917bc.tar.bz2 | |
Merge branch 'chris/malloc'
This replaces most instances of AllocVec/FreeVec in the Amiga frontend code with malloc/free, to enable OS3 to get full benefit from the clib2 slab allocator.
Diffstat (limited to 'frontends/amiga/gui_options.c')
| -rwxr-xr-x | frontends/amiga/gui_options.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c index a890a9126..fb5d1b195 100755 --- a/frontends/amiga/gui_options.c +++ b/frontends/amiga/gui_options.c @@ -73,7 +73,6 @@ #include "amiga/gui_options.h" #include "amiga/help.h" #include "amiga/libs.h" -#include "amiga/memory.h" #include "amiga/nsoption.h" #include "amiga/object.h" #include "amiga/selectmenu.h" @@ -636,7 +635,7 @@ void ami_gui_opts_open(void) if(!gow) { - gow = ami_misc_allocvec_clear(sizeof(struct ami_gui_opts_window), 0); + gow = calloc(1, sizeof(struct ami_gui_opts_window)); if(gow == NULL) return; ami_gui_opts_setup(gow); @@ -2284,7 +2283,7 @@ struct List *ami_gui_opts_websearch(void) const char *name; int iter; - list = AllocVecTagList(sizeof(struct List), NULL); + list = malloc(sizeof(struct List)); NewList(list); if (nsoption_charp(search_engines_file) == NULL) return list; @@ -2314,6 +2313,6 @@ void ami_gui_opts_websearch_free(struct List *websearchlist) FreeChooserNode(node); } while((node = nnode)); - FreeVec(websearchlist); + free(websearchlist); } |