Commit: f6693e1bbe8bfd839516b665af72868d6cffed5b
Parent: bb873896f91866c9cb19d2689d58620a097ca0de
Author: opask
Date: Mon, 23 Jul 2018 19:18:58 -0600
remove mem_free from auth.c, bfu.c, block.c, and bookmark.c
Diffstat:
| M | auth.c | | | 44 | ++++++++++++++++++++++---------------------- |
| M | bfu.c | | | 80 | ++++++++++++++++++++++++++++++++++++++++++------------------------------------- |
| M | block.c | | | 20 | ++++++++++---------- |
| M | bookmark.c | | | 63 | +++++++++++++++++++++++++++++++-------------------------------- |
4 files changed, 106 insertions(+), 101 deletions(-)
diff --git a/auth.c b/auth.c
@@ -70,7 +70,7 @@ static unsigned char *basic_encode(unsigned char *user, unsigned char *password)
add_to_strn(&p, cast_uchar ":");
add_to_strn(&p, password);
e = base64_encode(p, (int)strlen(cast_const_char p), cast_uchar "", cast_uchar "", -1);
- mem_free(p);
+ free(p);
return e;
}
@@ -96,14 +96,14 @@ unsigned char *get_auth_realm(unsigned char *url, unsigned char *head, int proxy
}
}
if (casecmp(h, cast_uchar "Basic", 5)) {
- mem_free(h);
+ free(h);
unknown = 1;
goto try_next;
}
known = 1;
q = cast_uchar strchr(cast_const_char h, '"');
if (!q) {
- mem_free(h);
+ free(h);
goto try_next;
}
q++;
@@ -113,7 +113,7 @@ unsigned char *get_auth_realm(unsigned char *url, unsigned char *head, int proxy
if (*q == '\\' && !*++q) break;
add_chr_to_str(&r, &l, *q++);
}
- mem_free(h);
+ free(h);
return r;
}
@@ -132,13 +132,13 @@ static unsigned char *auth_from_url(unsigned char *url, int proxy)
add_to_str(&r, &l, cast_uchar "Authorization: Basic ");
add_to_str(&r, &l, e);
add_to_str(&r, &l, cast_uchar "\r\n");
- mem_free(e);
- if (user) mem_free(user);
- if (password) mem_free(password);
+ free(e);
+ free(user);
+ free(password);
return r;
}
- if (user) mem_free(user);
- if (password) mem_free(password);
+ free(user);
+ free(password);
return NULL;
}
@@ -177,20 +177,20 @@ unsigned char *get_auth_string(unsigned char *url, int proxy)
if (proxy && (r = auth_from_url(url, proxy))) goto have_passwd;
have_passwd:
- mem_free(host);
+ free(host);
return r;
}
static void free_auth_entry(struct http_auth *a)
{
- mem_free(a->host);
- mem_free(a->realm);
- mem_free(a->user);
- mem_free(a->password);
- if (a->directory) mem_free(a->directory);
- mem_free(a->user_password_encoded);
+ free(a->host);
+ free(a->realm);
+ free(a->user);
+ free(a->password);
+ free(a->directory);
+ free(a->user_password_encoded);
del_from_list(a);
- mem_free(a);
+ free(a);
}
void free_auth(void)
@@ -213,7 +213,7 @@ void add_auth(unsigned char *url, unsigned char *realm, unsigned char *user, uns
host = get_host_name(p);
port = get_port(p);
}
- mem_free(p);
+ free(p);
}
if (!host) return;
foreach(struct http_auth, a, la, auth) if (a->proxy == proxy && !casestrcmp(a->host, host) && a->port == port && !strcmp(cast_const_char a->realm, cast_const_char realm)) {
@@ -250,15 +250,15 @@ int find_auth(unsigned char *url, unsigned char *realm)
d = cast_uchar strrchr(cast_const_char data, '/');
if (d) d[1] = 0;
foreach(struct http_auth, a, la, auth) if (!a->proxy && !casestrcmp(a->host, host) && a->port == port && !strcmp(cast_const_char a->realm, cast_const_char realm) && strcmp(cast_const_char a->directory, cast_const_char data)) {
- mem_free(a->directory);
+ free(a->directory);
a->directory = data;
- mem_free(host);
+ free(host);
del_from_list(a);
add_to_list(auth, a);
return 0;
}
- mem_free(host);
- mem_free(data);
+ free(host);
+ free(data);
return -1;
}
diff --git a/bfu.c b/bfu.c
@@ -59,8 +59,9 @@ void freeml(struct memory_list *ml)
{
int i;
if (!ml) return;
- for (i = 0; i < ml->n; i++) mem_free(ml->p[i]);
- mem_free(ml);
+ for (i = 0; i < ml->n; i++)
+ free(ml->p[i]);
+ free(ml);
}
static inline int is_utf_8(struct terminal *term)
@@ -151,7 +152,7 @@ static unsigned select_hotkey(struct terminal *term, unsigned char *text, unsign
if (!text || cp_strchr(term_charset(term), text, c)) break;
cont:;
}
- if (text) mem_free(text);
+ free(text);
return c;
}
@@ -588,23 +589,26 @@ static void menu_func(struct window *win, struct links_event *ev, int fwd)
if (F) {
int i;
for (i = 0; i < menu->ni; i++) {
- mem_free(menu->hktxt1[i]);
- mem_free(menu->hktxt2[i]);
- mem_free(menu->hktxt3[i]);
+ free(menu->hktxt1[i]);
+ free(menu->hktxt2[i]);
+ free(menu->hktxt3[i]);
}
- mem_free(menu->hktxt1);
- mem_free(menu->hktxt2);
- mem_free(menu->hktxt3);
+ free(menu->hktxt1);
+ free(menu->hktxt2);
+ free(menu->hktxt3);
}
#endif
if (menu->items->free_i) {
int i;
for (i = 0; i < menu->ni; i++) {
- if (menu->items[i].free_i & 2) mem_free(menu->items[i].text);
- if (menu->items[i].free_i & 4) mem_free(menu->items[i].rtext);
- if (menu->items[i].free_i & 8) mem_free(menu->items[i].hotkey);
+ if (menu->items[i].free_i & 2)
+ free(menu->items[i].text);
+ if (menu->items[i].free_i & 4)
+ free(menu->items[i].rtext);
+ if (menu->items[i].free_i & 8)
+ free(menu->items[i].hotkey);
}
- mem_free(menu->items);
+ free(menu->items);
}
if (menu->free_function)
register_bottom_half(menu->free_function, menu->free_data);
@@ -877,7 +881,8 @@ void display_dlg_item(struct dialog_data *dlg, struct dialog_item_data *di, int
t = di->cdata + di->vpos;
}
print_text(term, di->x, di->y, di->l, t, COLOR_DIALOG_FIELD_TEXT);
- if (di->item->type == D_FIELD_PASS) mem_free(t);
+ if (di->item->type == D_FIELD_PASS)
+ free(t);
if (sel) {
set_cursor(term, di->x + vposlen - cposlen, di->y, di->x + vposlen - cposlen, di->y);
set_window_ptr(dlg->win, di->x, di->y);
@@ -942,7 +947,7 @@ void display_dlg_item(struct dialog_data *dlg, struct dialog_item_data *di, int
text3 = cast_uchar "";
}
if (!text2) {
- mem_free(text);
+ free(text);
break;
}
text3 = stracpy(text3);
@@ -983,9 +988,9 @@ void display_dlg_item(struct dialog_data *dlg, struct dialog_item_data *di, int
g_print_text(dev, p, di->y, bfu_style_wb_mono, text3, &p);
drv->fill_area(dev, p, di->y, di->x + di->l, di->y + G_BFU_FONT_SIZE, bfu_fg_color);
drv->set_clip_area(dev, &r);
- mem_free(text);
- mem_free(text2);
- mem_free(text3);
+ free(text);
+ free(text2);
+ free(text3);
if (sel) {
set_window_ptr(dlg->win, di->x, di->y);
}
@@ -1000,7 +1005,7 @@ void display_dlg_item(struct dialog_data *dlg, struct dialog_item_data *di, int
strcat(cast_char text2, cast_const_char G_DIALOG_BUTTON_R);
di->l = 0;
g_print_text(dev, di->x, di->y, st, text2, &di->l);
- mem_free(text2);
+ free(text2);
if (dlg->s) exclude_from_set(&dlg->s, di->x, di->y, di->x + di->l, di->y + G_BFU_FONT_SIZE);
if (sel) set_window_ptr(dlg->win, di->x, di->y + G_BFU_FONT_SIZE);
break;
@@ -1082,7 +1087,7 @@ static void dlg_set_history(struct terminal *term, struct dialog_item_data *di)
strcpy(cast_char di->cdata, cast_const_char s);
di->cpos = (int)strlen(cast_const_char s);
di->vpos = 0;
- mem_free(s);
+ free(s);
}
static int dlg_mouse(struct dialog_data *dlg, struct dialog_item_data *di, struct links_event *ev)
@@ -1166,7 +1171,7 @@ static void redraw_dialog(struct terminal *term, void *dlg_)
drv->set_clip_area(term->dev, &dlg->r);
for (i = 0; i < dlg->s->m; i++) if (is_rect_valid(&dlg->s->r[i]))
drv->fill_area(term->dev, dlg->s->r[i].x1, dlg->s->r[i].y1, dlg->s->r[i].x2, dlg->s->r[i].y2, bfu_bg_color);
- mem_free(dlg->s);
+ free(dlg->s);
dlg->s = NULL;
}
#endif
@@ -1182,7 +1187,7 @@ static void tab_compl(struct terminal *term, void *hi_, void *win_)
strcpy(cast_char di->cdata, cast_const_char s);
di->cpos = (int)strlen(cast_const_char s);
di->vpos = 0;
- mem_free(s);
+ free(s);
ev.x = term->x;
ev.y = term->y;
dialog_func(win, &ev, 0);
@@ -1212,14 +1217,13 @@ static void do_tab_compl(struct terminal *term, struct list_head *history, struc
items[n].free_i = 3;
if (n == MAXINT) overalloc();
n++;
- } else {
- mem_free(s);
- }
+ } else
+ free(s);
}
if (n == 1) {
tab_compl(term, items->data, win);
- mem_free(items->text);
- mem_free(items);
+ free(items->text);
+ free(items);
return;
}
if (n) {
@@ -1413,7 +1417,7 @@ void dialog_func(struct window *win, struct links_event *ev, int fwd)
unsigned char *a = memacpy(di->cdata, di->cpos);
if (a) {
set_clipboard_text(term, a);
- mem_free(a);
+ free(a);
}
memmove(di->cdata, di->cdata + di->cpos, strlen(cast_const_char di->cdata + di->cpos) + 1);
di->cpos = 0;
@@ -1451,7 +1455,7 @@ clipbd_paste:
memcpy(&di->cdata[di->cpos], clipboard, strlen(cast_const_char clipboard));
di->cpos += (int)strlen(cast_const_char clipboard);
}
- mem_free(clipboard);
+ free(clipboard);
}
goto dsp_f;
}
@@ -1508,7 +1512,7 @@ clipbd_paste:
if (dlg->dlg->abort) dlg->dlg->abort(dlg);
for (i = 0; i < dlg->n; i++) {
struct dialog_item_data *di = &dlg->items[i];
- if (di->cdata) mem_free(di->cdata);
+ free(di->cdata);
free_list(struct history_item, di->history);
}
freeml(dlg->ml);
@@ -1860,7 +1864,7 @@ int dlg_format_text(struct dialog_data *dlg, struct terminal *term, unsigned cha
tx1 = tx2 + 1;
} while ((tx2 = cast_uchar strchr(cast_const_char tx1, '\n')));
dlg_format_text(dlg, term, tx1, x, y, w, rw, co, align);
- mem_free(txt);
+ free(txt);
} else {
int www;
unsigned char *txt;
@@ -1879,7 +1883,8 @@ int dlg_format_text(struct dialog_data *dlg, struct terminal *term, unsigned cha
if (!r) {
txt = memacpy(text, ww.last_wrap - text);
www = g_text_width(ww.style, txt);
- if (!term) mem_free(txt);
+ if (!term)
+ free(txt);
text = ww.last_wrap;
if (*text == ' ') text++;
} else {
@@ -1890,7 +1895,8 @@ int dlg_format_text(struct dialog_data *dlg, struct terminal *term, unsigned cha
int xx = (align & AL_MASK) == AL_CENTER ? x + (w - www) / 2 : x;
g_print_text(dlg->win->term->dev, xx, *y, ww.style, txt, NULL);
if (dlg->s) exclude_from_set(&dlg->s, xx, *y, xx + www, *y + G_BFU_FONT_SIZE);
- if (!r) mem_free(txt);
+ if (!r)
+ free(txt);
}
if (www > w) www = w;
if (rw && www > *rw) *rw = www;
@@ -2194,7 +2200,7 @@ void msg_box_fn(struct dialog_data *dlg)
dlg_format_text(dlg, term, text, dlg->x + DIALOG_LB, &y, w, NULL, COLOR_DIALOG_TEXT, dlg->dlg->align);
y += LL;
dlg_format_buttons(dlg, term, dlg->items, dlg->n, dlg->x + DIALOG_LB, &y, w, NULL, AL_CENTER);
- mem_free(text);
+ free(text);
}
static int msg_box_button(struct dialog_data *dlg, struct dialog_item_data *di)
@@ -2281,11 +2287,11 @@ void add_to_history(struct terminal *term, struct history *h, unsigned char *t)
hi = xmalloc(sizeof(struct history_item) + l);
memcpy(hi->str, s, l + 1);
if (term)
- mem_free(s);
+ free(s);
if (term) foreach(struct history_item, hs, lhs, h->items) if (!strcmp(cast_const_char hs->str, cast_const_char hi->str)) {
lhs = lhs->prev;
del_from_list(hs);
- mem_free(hs);
+ free(hs);
h->n--;
}
add_to_list(h->items, hi);
@@ -2299,7 +2305,7 @@ void add_to_history(struct terminal *term, struct history *h, unsigned char *t)
}
hd = list_struct(h->items.prev, struct history_item);
del_from_list(hd);
- mem_free(hd);
+ free(hd);
h->n--;
}
}
diff --git a/block.c b/block.c
@@ -55,8 +55,8 @@ static void block_delete_item(struct list *data)
/*Destructor */
struct block *del = get_struct(data, struct block, head);
if (del->head.list_entry.next) del_from_list(&del->head);
- mem_free(del->url);
- mem_free(del);
+ free(del->url);
+ free(del);
}
static void block_copy_item(struct list *in, struct list *out)
@@ -65,7 +65,7 @@ static void block_copy_item(struct list *in, struct list *out)
struct block *item_in = get_struct(in, struct block, head);
struct block *item_out = get_struct(out, struct block, head);
- mem_free(item_out->url);
+ free(item_out->url);
item_out->url = stracpy(item_in->url);
}
@@ -82,7 +82,7 @@ static unsigned char *block_type_item(struct terminal *term, struct list *data,
/*I have no idea what this does, but it os copied from working code in types.c*/
txt1 = convert(blocks_ld.codepage, term_charset(term), txt, NULL);
- mem_free(txt);
+ free(txt);
return txt1;
}
@@ -99,7 +99,7 @@ static void block_edit_abort(struct dialog_data *data)
struct block *item = (struct block *)data->dlg->udata;
struct dialog *dlg = data->dlg;
- mem_free(dlg->udata2);
+ free(dlg->udata2);
if (item) block_delete_item(&item->head);
}
@@ -117,7 +117,7 @@ static void block_edit_done(void *data)
url = (unsigned char *)&d->items[4];
txt = convert(term_charset(s->dlg->win->term), blocks_ld.codepage, url, NULL);
- mem_free(item->url);
+ free(item->url);
item->url = txt;
s->fn(s->dlg, s->data, &item->head, &blocks_ld);
@@ -179,7 +179,7 @@ static void block_edit_item(struct dialog_data *dlg, struct list *data, void (*o
url = (unsigned char *)&d->items[4];
txt = convert(blocks_ld.codepage, term_charset(dlg->win->term), neww->url, NULL);
safe_strncpy(url, txt, MAX_STR_LEN);
- mem_free(txt);
+ free(txt);
/* Create the dialog */
s = xmalloc(sizeof(struct assoc_ok_struct));
@@ -272,7 +272,7 @@ void *block_url_add(void *ses_, unsigned char *url)
new_list = block_new_item(0);
new_b = get_struct(new_list, struct block, head);
- mem_free(new_b->url);
+ free(new_b->url);
new_b->url = stracpy(url);
new_b->head.type = 0;
@@ -347,10 +347,10 @@ void free_blocks(void)
foreach(struct list, b, lb, blocks.list_entry) {
struct block *bm = get_struct(b, struct block, head);
- mem_free(bm->url);
+ free(bm->url);
lb = lb->prev;
del_from_list(b);
- mem_free(bm);
+ free(bm);
}
free_history(block_search_histroy);
diff --git a/bookmark.c b/bookmark.c
@@ -88,11 +88,11 @@ static void free_bookmarks(void)
foreach(struct list, b, lb, bookmarks.list_entry) {
struct bookmark_list *bm = get_struct(b, struct bookmark_list, head);
- mem_free(bm->title);
- mem_free(bm->url);
+ free(bm->title);
+ free(bm->url);
lb = lb->prev;
del_from_list(b);
- mem_free(bm);
+ free(bm);
}
}
@@ -136,7 +136,7 @@ static void *bookmark_default_value(struct session *ses, unsigned char type)
clr_white(zelena->title);
}
- mem_free(txt);
+ free(txt);
return zelena;
}
@@ -150,9 +150,9 @@ static void bookmark_copy_item(struct list *in, struct list *out)
item_out->head.type = item_in->head.type;
item_out->head.depth = item_in->head.depth;
- mem_free(item_out->title);
+ free(item_out->title);
item_out->title = stracpy(item_in->title);
- mem_free(item_out->url);
+ free(item_out->url);
item_out->url = stracpy(item_in->url);
}
@@ -221,11 +221,11 @@ static void bookmark_edit_done(void *data)
title = (unsigned char *)&d->items[a];
url = title + MAX_STR_LEN;
- mem_free(item->title);
+ free(item->title);
item->title = convert(term_charset(s->dlg->win->term), bookmark_ld.codepage, title, NULL);
clr_white(item->title);
- mem_free(item->url);
+ free(item->url);
item->url = convert(term_charset(s->dlg->win->term), bookmark_ld.codepage, url, NULL);
clr_white(item->url);
@@ -240,7 +240,7 @@ static void bookmark_edit_abort(struct dialog_data *data)
struct bookmark_list *item = (struct bookmark_list *)data->dlg->udata;
struct dialog *dlg = data->dlg;
- mem_free(dlg->udata2);
+ free(dlg->udata2);
if (item) bookmark_delete_item(&item->head);
}
@@ -274,12 +274,12 @@ static void bookmark_edit_item(struct dialog_data *dlg, struct list *data, void
txt = convert(bookmark_ld.codepage, term_charset(dlg->win->term), item->title, NULL);
clr_white(txt);
safe_strncpy(title, txt, MAX_STR_LEN);
- mem_free(txt);
+ free(txt);
txt = convert(bookmark_ld.codepage, term_charset(dlg->win->term), item->url, NULL);
clr_white(txt);
safe_strncpy(url, txt, MAX_STR_LEN);
- mem_free(txt);
+ free(txt);
}
switch (dlg_title)
@@ -354,8 +354,7 @@ static struct list *bookmark_new_item(void *data)
else
b->url = stracpy(cast_uchar "");
- if (zelena)
- mem_free(zelena);
+ free(zelena);
return &b->head;
}
@@ -385,7 +384,7 @@ static unsigned char *bookmark_type_item(struct terminal *term, struct list *dat
txt1 = convert(bookmark_ld.codepage, term_charset(term), txt, NULL);
clr_white(txt1);
- mem_free(txt);
+ free(txt);
return txt1;
}
@@ -405,9 +404,9 @@ static void bookmark_delete_item(struct list *data)
struct bookmark_list *item = get_struct(data, struct bookmark_list, head);
if (item->head.list_entry.next) del_from_list(&item->head);
- mem_free(item->url);
- mem_free(item->title);
- mem_free(item);
+ free(item->url);
+ free(item->title);
+ free(item);
}
static int substr_utf8(unsigned char *string, unsigned char *substr)
@@ -416,8 +415,8 @@ static int substr_utf8(unsigned char *string, unsigned char *substr)
string = unicode_upcase_string(string);
substr = unicode_upcase_string(substr);
r = !!strstr(cast_const_char string, cast_const_char substr);
- mem_free(string);
- mem_free(substr);
+ free(string);
+ free(substr);
return r;
}
@@ -504,7 +503,7 @@ static void add_bookmark(unsigned char *title, unsigned char *url, int depth)
if (p->depth < b->head.depth) b->head.fotr = p; /* directory b belongs into */
else b->head.fotr = p->fotr;
- mem_free(dop);
+ free(dop);
}
/* Created pre-cooked bookmarks */
@@ -600,7 +599,7 @@ static void load_bookmarks(struct session *ses)
if (namelen != 2 || casecmp(name, cast_uchar "/a", 2)) continue; /* ignore all other elements */
*s = 0;
add_bookmark(title, url, depth);
- mem_free(url);
+ free(url);
status = 0;
continue;
@@ -613,9 +612,10 @@ static void load_bookmarks(struct session *ses)
continue;
}
}
- if (status == 2) mem_free(url);
+ if (status == 2)
+ free(url);
smitec:
- mem_free(buf);
+ free(buf);
d_opt = &dd_opt;
bookmark_ld.modified = 0;
@@ -650,7 +650,7 @@ void reinit_bookmarks(struct session *ses, unsigned char *new_bookmarks_file, in
buf = read_config_file(new_bookmarks_file);
if (buf) {
- mem_free(buf);
+ free(buf);
free_bookmarks();
safe_strncpy(bookmarks_file, new_bookmarks_file, MAX_STR_LEN);
bookmarks_codepage = new_bookmarks_codepage;
@@ -746,8 +746,8 @@ static void save_bookmarks(struct session *ses)
add_to_str(&data, &l, cast_uchar " <DT><H3>");
add_to_str(&data, &l, txt1);
add_to_str(&data, &l, cast_uchar "</H3>\n<DL>\n");
- mem_free(txt);
- mem_free(txt1);
+ free(txt);
+ free(txt1);
depth++;
} else {
unsigned char *txt1, *txt2, *txt11;
@@ -761,9 +761,9 @@ static void save_bookmarks(struct session *ses)
add_to_str(&data, &l, cast_uchar "\">");
add_to_str(&data, &l, txt11);
add_to_str(&data, &l, cast_uchar "</A>\n");
- mem_free(txt1);
- mem_free(txt2);
- mem_free(txt11);
+ free(txt1);
+ free(txt2);
+ free(txt11);
}
}
for (a = 0; a <depth; a++) add_to_str(&data, &l, cast_uchar "</DL>\n");
@@ -772,15 +772,14 @@ static void save_bookmarks(struct session *ses)
"</HTML>\n"
);
err = write_to_config_file(bookmarks_file, data, 1);
- mem_free(data);
+ free(data);
if (!err) {
bookmark_ld.modified = 0;
- } else {
+ } else
if (ses) {
unsigned char *f = stracpy(bookmarks_file);
msg_box(ses->term, getml(f, NULL), TEXT_(T_BOOKMARK_ERROR), AL_CENTER, TEXT_(T_UNABLE_TO_WRITE_TO_BOOKMARK_FILE), cast_uchar " ", f, cast_uchar ": ", get_err_msg(err), MSG_BOX_END, NULL, 1, TEXT_(T_CANCEL), msg_box_null, B_ENTER | B_ESC);
}
- }
EINTRLOOP(rs, stat(cast_const_char bookmarks_file, &bookmarks_st));
if (rs)