mirror of
https://github.com/netsurf-browser/netsurf
synced 2024-12-27 14:29:42 +03:00
More allocvec/malloc changes
This commit is contained in:
Chris Young
parent
a8bd2af710
commit
2c6f2f4ef5
@ -141,7 +141,6 @@
|
||||
#include "amiga/libs.h"
|
||||
#include "amiga/login.h"
|
||||
#include "amiga/menu.h"
|
||||
#include "amiga/memory.h"
|
||||
#include "amiga/misc.h"
|
||||
#include "amiga/nsoption.h"
|
||||
#include "amiga/plotters.h"
|
||||
@ -1371,7 +1370,7 @@ nserror ami_gui_get_space_box(Object *obj, struct IBox **bbox)
|
||||
{
|
||||
#ifdef __amigaos4__
|
||||
if(LIB_IS_AT_LEAST((struct Library *)SpaceBase, 53, 6)) {
|
||||
*bbox = AllocVecTagList(sizeof(struct IBox), NULL);
|
||||
*bbox = malloc(sizeof(struct IBox));
|
||||
if(*bbox == NULL) return NSERROR_NOMEM;
|
||||
GetAttr(SPACE_RenderBox, obj, (ULONG *)*bbox);
|
||||
} else
|
||||
@ -1388,7 +1387,7 @@ void ami_gui_free_space_box(struct IBox *bbox)
|
||||
{
|
||||
#ifdef __amigaos4__
|
||||
if(LIB_IS_AT_LEAST((struct Library *)SpaceBase, 53, 6)) {
|
||||
FreeVec(bbox);
|
||||
free(bbox);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -1516,7 +1515,7 @@ static struct IBox *ami_ns_rect_to_ibox(struct gui_window_2 *gwin, const struct
|
||||
{
|
||||
struct IBox *bbox, *ibox;
|
||||
|
||||
ibox = AllocVecTagList(sizeof(struct IBox), NULL);
|
||||
ibox = malloc(sizeof(struct IBox));
|
||||
if(ibox == NULL) return NULL;
|
||||
|
||||
if(ami_gui_get_space_box((Object *)gwin->objects[GID_BROWSER], &bbox) != NSERROR_OK) {
|
||||
@ -1537,7 +1536,7 @@ static struct IBox *ami_ns_rect_to_ibox(struct gui_window_2 *gwin, const struct
|
||||
(ibox->Top > (bbox->Top + bbox->Height)) ||
|
||||
(ibox->Width < 0) || (ibox->Height < 0))
|
||||
{
|
||||
FreeVec(ibox);
|
||||
free(ibox);
|
||||
ami_gui_free_space_box(bbox);
|
||||
return NULL;
|
||||
}
|
||||
@ -2585,7 +2584,7 @@ static void ami_handle_appmsg(void)
|
||||
{
|
||||
if((appwinargs = &appmsg->am_ArgList[i]))
|
||||
{
|
||||
if((filename = AllocVecTagList(1024, NULL)))
|
||||
if((filename = malloc(1024)))
|
||||
{
|
||||
if(appwinargs->wa_Lock)
|
||||
{
|
||||
@ -2666,7 +2665,7 @@ static void ami_handle_appmsg(void)
|
||||
}
|
||||
}
|
||||
}
|
||||
FreeVec(filename);
|
||||
free(filename);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -3819,7 +3818,7 @@ gui_window_create(struct browser_window *bw,
|
||||
|
||||
if(curh > (scrn->Height - cury)) curh = scrn->Height - cury;
|
||||
|
||||
g = ami_misc_allocvec_clear(sizeof(struct gui_window), 0);
|
||||
g = calloc(1, sizeof(struct gui_window));
|
||||
|
||||
if(!g)
|
||||
{
|
||||
@ -3893,7 +3892,7 @@ gui_window_create(struct browser_window *bw,
|
||||
return g;
|
||||
}
|
||||
|
||||
g->shared = ami_misc_allocvec_clear(sizeof(struct gui_window_2), 0);
|
||||
g->shared = calloc(1, sizeof(struct gui_window_2));
|
||||
|
||||
if(!g->shared)
|
||||
{
|
||||
@ -3956,7 +3955,7 @@ gui_window_create(struct browser_window *bw,
|
||||
g->shared->tabs=1;
|
||||
g->shared->next_tab=1;
|
||||
|
||||
g->shared->svbuffer = ami_misc_allocvec_clear(2000, 0);
|
||||
g->shared->svbuffer = calloc(1, 2000);
|
||||
|
||||
g->shared->helphints[GID_BACK] =
|
||||
translate_escape_chars(messages_get("HelpToolbarBack"));
|
||||
@ -4348,8 +4347,8 @@ gui_window_create(struct browser_window *bw,
|
||||
if(!g->shared->win)
|
||||
{
|
||||
amiga_warn_user("NoMemory","");
|
||||
FreeVec(g->shared);
|
||||
FreeVec(g);
|
||||
free(g->shared);
|
||||
free(g);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -4529,12 +4528,12 @@ static void gui_window_destroy(struct gui_window *g)
|
||||
|
||||
ami_utf8_free(g->tabtitle);
|
||||
|
||||
FreeVec(g);
|
||||
free(g);
|
||||
return;
|
||||
}
|
||||
|
||||
ami_plot_release_pens(g->shared->shared_pens);
|
||||
FreeVec(g->shared->shared_pens);
|
||||
free(g->shared->shared_pens);
|
||||
ami_schedule_redraw_remove(g->shared);
|
||||
ami_schedule(-1, ami_gui_refresh_favicon, g->shared);
|
||||
|
||||
@ -4564,7 +4563,7 @@ static void gui_window_destroy(struct gui_window *g)
|
||||
|
||||
free(g->shared->wintitle);
|
||||
ami_utf8_free(g->shared->status);
|
||||
FreeVec(g->shared->svbuffer);
|
||||
free(g->shared->svbuffer);
|
||||
|
||||
for(gid = 0; gid < GID_LAST; gid++)
|
||||
free(g->shared->helphints[gid]);
|
||||
@ -4574,7 +4573,7 @@ static void gui_window_destroy(struct gui_window *g)
|
||||
Remove(g->tab_node);
|
||||
FreeClickTabNode(g->tab_node);
|
||||
}
|
||||
FreeVec(g); // g->shared should be freed by DelObject()
|
||||
free(g); // g->shared should be freed by DelObject()
|
||||
|
||||
if(IsMinListEmpty(window_list))
|
||||
{
|
||||
@ -5266,7 +5265,7 @@ static bool gui_window_drag_start(struct gui_window *g, gui_drag_type type,
|
||||
|
||||
if(g->shared->ptr_lock)
|
||||
{
|
||||
FreeVec(g->shared->ptr_lock);
|
||||
free(g->shared->ptr_lock);
|
||||
g->shared->ptr_lock = NULL;
|
||||
}
|
||||
}
|
||||
@ -5612,7 +5611,7 @@ int main(int argc, char** argv)
|
||||
len += strlen(users_dir);
|
||||
len += 2; /* for poss path sep and NULL term */
|
||||
|
||||
current_user_dir = AllocVecTagList(len, NULL);
|
||||
current_user_dir = malloc(len);
|
||||
if(current_user_dir == NULL) {
|
||||
ami_misc_fatal_error("Failed to allocate memory");
|
||||
ami_schedule_free();
|
||||
@ -5729,7 +5728,7 @@ int main(int argc, char** argv)
|
||||
netsurf_exit();
|
||||
|
||||
ami_nsoption_free();
|
||||
FreeVec(current_user_dir);
|
||||
free(current_user_dir);
|
||||
FreeVec(current_user_faviconcache);
|
||||
FreeVec(current_user);
|
||||
|
||||
|
||||
@ -176,11 +176,13 @@ extern struct Screen *scrn;
|
||||
extern struct MsgPort *sport;
|
||||
extern struct gui_window *cur_gw;
|
||||
|
||||
/* The return value must be deallocated using FreeVec() */
|
||||
STRPTR ami_locale_langs(int *codeset);
|
||||
|
||||
void ami_get_msg(void);
|
||||
void ami_try_quit(void);
|
||||
void ami_quit_netsurf(void);
|
||||
void ami_schedule_redraw(struct gui_window_2 *gwin, bool full_redraw);
|
||||
STRPTR ami_locale_langs(int *codeset);
|
||||
int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie);
|
||||
bool ami_text_box_at_point(struct gui_window_2 *gwin, ULONG *restrict x, ULONG *restrict y);
|
||||
bool ami_mouse_to_ns_coords(struct gui_window_2 *gwin, int *restrict x, int *restrict y,
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -51,7 +51,6 @@
|
||||
#include "graphics/rpattr.h"
|
||||
|
||||
#include "amiga/libs.h"
|
||||
#include "amiga/memory.h"
|
||||
#include "amiga/misc.h"
|
||||
#include "amiga/object.h"
|
||||
#include "amiga/plotters.h"
|
||||
@ -117,8 +116,8 @@ void ami_history_open(struct gui_window *gw)
|
||||
|
||||
if(!gw->hw)
|
||||
{
|
||||
gw->hw = ami_misc_allocvec_clear(sizeof(struct history_window), 0);
|
||||
gw->hw->gg = ami_misc_allocvec_clear(sizeof(struct gui_globals), 0);
|
||||
gw->hw = calloc(1, sizeof(struct history_window));
|
||||
gw->hw->gg = calloc(1, sizeof(struct gui_globals));
|
||||
|
||||
ami_init_layers(gw->hw->gg, scrn->Width, scrn->Height, false);
|
||||
|
||||
@ -227,7 +226,7 @@ static bool ami_history_click(struct history_window *hw, uint16 code)
|
||||
void ami_history_close(struct history_window *hw)
|
||||
{
|
||||
ami_free_layers(hw->gg);
|
||||
FreeVec(hw->gg);
|
||||
free(hw->gg);
|
||||
hw->gw->hw = NULL;
|
||||
DisposeObject(hw->objects[OID_MAIN]);
|
||||
DelObject(hw->node);
|
||||
|
||||
@ -49,7 +49,6 @@
|
||||
#include "amiga/os3support.h"
|
||||
#include "amiga/bitmap.h"
|
||||
#include "amiga/icon.h"
|
||||
#include "amiga/memory.h"
|
||||
|
||||
#define THUMBNAIL_WIDTH 100 /* Icon sizes for thumbnails, usually the same as */
|
||||
#define THUMBNAIL_HEIGHT 86 /* WIDTH/HEIGHT in desktop/thumbnail.c */
|
||||
@ -239,7 +238,7 @@ bool amiga_icon_convert(struct content *c)
|
||||
if(dobj) FreeDiskObject(dobj);
|
||||
|
||||
if(format==IDFMT_PALETTEMAPPED)
|
||||
FreeVec(imagebufptr);
|
||||
free(imagebufptr);
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -326,7 +325,7 @@ static ULONG *amiga_icon_convertcolouricon32(UBYTE *icondata, ULONG width, ULONG
|
||||
|
||||
if (alpha==0) alpha=0xff;
|
||||
|
||||
argbicon = (ULONG *)AllocVecTagList(width*height*4, NULL);
|
||||
argbicon = (ULONG *)malloc(width * height * 4);
|
||||
if (!argbicon) return(NULL);
|
||||
|
||||
cmap=GetColorMap(pals1);
|
||||
@ -485,8 +484,8 @@ void amiga_icon_superimpose_favicon(char *path, struct hlcache_handle *icon, cha
|
||||
if(format == IDFMT_PALETTEMAPPED)
|
||||
{
|
||||
/* Free the 32-bit data we created */
|
||||
FreeVec(icondata1);
|
||||
FreeVec(icondata2);
|
||||
free(icondata1);
|
||||
free(icondata2);
|
||||
}
|
||||
}
|
||||
|
||||
@ -501,7 +500,7 @@ struct DiskObject *amiga_icon_from_bitmap(struct bitmap *bm)
|
||||
{
|
||||
bitmap = ami_bitmap_get_native(bm, THUMBNAIL_WIDTH,
|
||||
THUMBNAIL_HEIGHT, NULL);
|
||||
icondata = AllocVecTagList(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT, NULL);
|
||||
icondata = malloc(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT);
|
||||
ami_bitmap_set_icondata(bm, icondata);
|
||||
|
||||
if(bitmap) {
|
||||
@ -543,6 +542,6 @@ void amiga_icon_free(struct DiskObject *dobj)
|
||||
struct bitmap *bm = dobj->do_Gadget.UserData;
|
||||
|
||||
FreeDiskObject(dobj);
|
||||
if(bm) FreeVec(ami_bitmap_get_icondata(bm));
|
||||
if(bm) free(ami_bitmap_get_icondata(bm));
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user