Commit: bb873896f91866c9cb19d2689d58620a097ca0de
Parent: 2b9bd7595a468649637dbf06f8cd0ba0db60bfea
Author: opask
Date: Mon, 23 Jul 2018 19:11:03 -0600
remove mem_free from cache.c, charsets.c, compress.c, connect.c, and cookies.c
Diffstat:
5 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/cache.c b/cache.c
@@ -145,7 +145,8 @@ int get_connection_cache_entry(struct connection *c)
if (get_cache_entry(c->url, &c->cache))
return -1;
e = c->cache;
- if (e->ip_address) mem_free(e->ip_address), e->ip_address = NULL;
+ free(e->ip_address);
+ e->ip_address = NULL;
if (!*c->socks_proxy && !is_proxy_url(c->url) && c->last_lookup_state.addr.n) {
unsigned char *a;
unsigned char *s = init_str();
@@ -209,7 +210,7 @@ void detach_cache_entry(struct cache_entry *e)
static void mem_free_fragment(struct fragment *f)
{
size_t s = (size_t)f->length;
- mem_free(f);
+ free(f);
s += sizeof(struct fragment);
}
@@ -413,10 +414,8 @@ void free_entry_to(struct cache_entry *e, off_t off)
void delete_entry_content(struct cache_entry *e)
{
truncate_entry(e, 0, 2);
- if (e->last_modified) {
- mem_free(e->last_modified);
- e->last_modified = NULL;
- }
+ free(e->last_modified);
+ e->last_modified = NULL;
}
void trim_cache_entry(struct cache_entry *e)
@@ -445,11 +444,11 @@ void delete_cache_entry(struct cache_entry *e)
cache_delete_from_tree(e);
delete_entry_content(e);
del_from_list(e);
- if (e->head) mem_free(e->head);
- if (e->redirect) mem_free(e->redirect);
- if (e->ip_address) mem_free(e->ip_address);
- if (e->ssl_info) mem_free(e->ssl_info);
- mem_free(e);
+ free(e->head);
+ free(e->redirect);
+ free(e->ip_address);
+ free(e->ssl_info);
+ free(e);
}
static int shrink_file_cache(int u)
diff --git a/charsets.c b/charsets.c
@@ -63,7 +63,7 @@ static void free_translation_table(struct conv_table *p)
{
int i;
for (i = 0; i < 256; i++) if (p[i].t) free_translation_table(p[i].u.tbl);
- mem_free(p);
+ free(p);
}
static_const unsigned char no_str[] = "*";
@@ -190,7 +190,8 @@ static int utf_table_init = 1;
static void free_utf_table(void)
{
int i;
- for (i = 128; i < 256; i++) mem_free(utf_table[i].u.str);
+ for (i = 128; i < 256; i++)
+ free(utf_table[i].u.str);
}
static struct conv_table *get_translation_table_to_utf_8(int from)
@@ -530,7 +531,7 @@ void charset_upcase_string(unsigned char **chp, int cp)
int i;
if (cp == utf8_table) {
ch = unicode_upcase_string(ch);
- mem_free(*chp);
+ free(*chp);
*chp = ch;
} else {
for (i = 0; ch[i]; i++) ch[i] = charset_upcase(ch[i], cp);
@@ -558,7 +559,7 @@ unsigned char *to_utf8_upcase(unsigned char *str, int cp)
unsigned char *str1, *str2;
str1 = convert(cp, utf8_table, str, NULL);
str2 = unicode_upcase_string(str1);
- mem_free(str1);
+ free(str1);
return str2;
}
diff --git a/compress.c b/compress.c
@@ -45,10 +45,10 @@ static void decompress_error(struct terminal *term, struct cache_entry *ce, unsi
{
unsigned char *u, *server;
if ((u = parse_http_header(ce->head, cast_uchar "Content-Encoding", NULL))) {
- mem_free(u);
+ free(u);
if ((server = get_host_name(ce->url))) {
add_blacklist_entry(server, BL_NO_COMPRESSION);
- mem_free(server);
+ free(server);
}
}
if (!display_error(term, TEXT_(T_DECOMPRESSION_ERROR), errp)) return;
@@ -235,14 +235,14 @@ static int decode_gzip(struct terminal *term, struct cache_entry *ce, int defl,
}
after_inflateend:
if (memory_error) {
- mem_free(p);
+ free(p);
if (out_of_memory(0, NULL, 0))
goto retry_after_memory_error;
decompress_error(term, ce, cast_uchar "zlib", z.msg ? (unsigned char *)z.msg : TEXT_(T_OUT_OF_MEMORY), errp);
return 1;
}
if (err && (unsigned char *)z.next_out == p) {
- mem_free(p);
+ free(p);
return 1;
}
ce->decompressed = p;
@@ -270,11 +270,11 @@ int get_file_by_term(struct terminal *term, struct cache_entry *ce, unsigned cha
if (enc) {
if (!casestrcmp(enc, cast_uchar "gzip") || !casestrcmp(enc, cast_uchar "x-gzip") || !casestrcmp(enc, cast_uchar "deflate")) {
int defl = !casestrcmp(enc, cast_uchar "deflate");
- mem_free(enc);
+ free(enc);
if (decode_gzip(term, ce, defl, errp)) goto uncompressed;
goto return_decompressed;
}
- mem_free(enc);
+ free(enc);
goto uncompressed;
}
uncompressed:
@@ -308,7 +308,7 @@ void free_decompressed_data(struct cache_entry *e)
internal("free_decompressed_data: decompressed_cache_size underflow %lu, %lu", (unsigned long)decompressed_cache_size, (unsigned long)e->decompressed_len);
decompressed_cache_size -= e->decompressed_len;
e->decompressed_len = 0;
- mem_free(e->decompressed);
+ free(e->decompressed);
e->decompressed = NULL;
}
}
diff --git a/connect.c b/connect.c
@@ -76,7 +76,7 @@ static void log_ssl_error(unsigned char *url, int line, int ret1, int ret2)
}
#endif
fprintf(stderr, "ssl error at %d: %d, %d, %d (%s), url (%s)\n", line, ret1, ret2, errno, strerror(errno), u);
- mem_free(u);
+ free(u);
#endif
}
@@ -196,7 +196,7 @@ void make_connection(struct connection *c, int port, int *sock, void (*func)(str
lp = strtol(cast_const_char p, (char **)(void *)&p, 10);
if (*p || lp <= 0 || lp >= 65536) {
badu:
- mem_free(host);
+ free(host);
setcstate(c, S_BAD_URL);
abort_connection(c);
return;
@@ -229,12 +229,11 @@ void make_connection(struct connection *c, int port, int *sock, void (*func)(str
b->l.dont_try_more_servers = 1;
dns_found(c, 0);
as = 0;
- } else if (c->no_cache >= NC_RELOAD) {
+ } else if (c->no_cache >= NC_RELOAD)
as = find_host_no_cache(host, &b->l.addr, &c->dnsquery, dns_found, c);
- } else {
+ else
as = find_host(host, &b->l.addr, &c->dnsquery, dns_found, c);
- }
- mem_free(host);
+ free(host);
if (as) setcstate(c, S_DNS);
}
@@ -467,7 +466,7 @@ static void handle_socks(void *c_)
add_bytes_to_str(&command, &len, c->socks_proxy, strcspn(cast_const_char c->socks_proxy, "@"));
add_chr_to_str(&command, &len, 0);
if (!(host = get_host_name(c->url))) {
- mem_free(command);
+ free(command);
setcstate(c, S_INTERNAL);
abort_connection(c);
return;
@@ -475,9 +474,9 @@ static void handle_socks(void *c_)
add_to_str(&command, &len, host);
add_to_str(&command, &len, c->dns_append);
add_chr_to_str(&command, &len, 0);
- mem_free(host);
+ free(host);
if (b->socks_byte_count >= len) {
- mem_free(command);
+ free(command);
setcstate(c, S_MODIFIED);
retry_connection(c);
return;
@@ -487,7 +486,7 @@ static void handle_socks(void *c_)
log_string(cast_uchar "\n");
}
EINTRLOOP(wr, (int)write(*b->sock, command + b->socks_byte_count, len - b->socks_byte_count));
- mem_free(command);
+ free(command);
if (wr <= 0) {
setcstate(c, wr ? get_error_from_errno(errno) : S_CANT_WRITE);
retry_connection(c);
@@ -724,7 +723,7 @@ static void connected(void *c_)
c->ssl = getSSL();
if (!c->ssl) {
ret1 = ret2 = 0;
- mem_free(h);
+ free(h);
goto ssl_error;
}
if (!proxies.only_proxies && !c->no_ssl_session) {
@@ -735,7 +734,7 @@ static void connected(void *c_)
if (SSL_set_session(c->ssl->ssl, ses) == 1)
c->ssl->session_set = 1;
}
- mem_free(h);
+ free(h);
}
#if !defined(OPENSSL_NO_STDIO)
if (!proxies.only_proxies) {
@@ -756,7 +755,7 @@ static void connected(void *c_)
SSL_set_tlsext_host_name(c->ssl->ssl, h);
skip_numeric_address:
#endif
- mem_free(h);
+ free(h);
switch ((ret2 = SSL_get_error(c->ssl->ssl, ret1 = SSL_connect(c->ssl->ssl)))) {
case SSL_ERROR_WANT_READ:
setcstate(c, S_SSL_NEG);
@@ -808,7 +807,7 @@ static void connected_callback(struct connection *c)
if (flags & BL_IGNORE_CERTIFICATE)
goto ignore_cert;
}
- mem_free(h);
+ free(h);
setcstate(c, err);
abort_connection(c);
return;
@@ -821,7 +820,7 @@ static void connected_callback(struct connection *c)
if (flags & BL_IGNORE_DOWNGRADE)
goto ignore_downgrade;
}
- mem_free(h);
+ free(h);
setcstate(c, S_DOWNGRADED_METHOD);
abort_connection(c);
return;
@@ -835,21 +834,21 @@ static void connected_callback(struct connection *c)
if (flags & BL_IGNORE_CIPHER)
goto ignore_cipher;
}
- mem_free(h);
+ free(h);
setcstate(c, err);
abort_connection(c);
return;
}
ignore_cipher:
- mem_free(h);
+ free(h);
}
}
retrieve_ssl_session(c);
c->last_lookup_state = b->l;
c->newconn = NULL;
b->func(c);
- mem_free(b);
+ free(b);
}
struct write_buffer {
@@ -908,7 +907,7 @@ static void write_select(void *c_)
void (*f)(struct connection *) = wb->done;
c->buffer = NULL;
set_handlers(wb->sock, NULL, NULL, NULL);
- mem_free(wb);
+ free(wb);
f(c);
}
}
@@ -924,7 +923,7 @@ void write_to_socket(struct connection *c, int s, unsigned char *data, int len,
wb->pos = 0;
wb->done = write_func;
memcpy(wb->data, data, len);
- if (c->buffer) mem_free(c->buffer);
+ free(c->buffer);
c->buffer = wb;
set_handlers(s, NULL, write_select, c);
}
@@ -1015,7 +1014,8 @@ void read_from_socket(struct connection *c, int s, struct read_buffer *buf, void
{
buf->done = read_func;
buf->sock = s;
- if (c->buffer && buf != c->buffer) mem_free(c->buffer);
+ if (buf != c->buffer)
+ free(c->buffer);
c->buffer = buf;
set_handlers(s, read_select, NULL, c);
}
diff --git a/cookies.c b/cookies.c
@@ -26,12 +26,12 @@ static struct list_head c_servers = { &c_servers, &c_servers };
void free_cookie(struct cookie *c)
{
- mem_free(c->name);
- if (c->value) mem_free(c->value);
- mem_free(c->server);
- mem_free(c->path);
- mem_free(c->domain);
- mem_free(c);
+ free(c->name);
+ free(c->value);
+ free(c->server);
+ free(c->path);
+ free(c->domain);
+ free(c);
}
static void accept_cookie(struct cookie *);
@@ -65,7 +65,7 @@ int set_cookie(struct terminal *term, unsigned char *url, unsigned char *str)
cookie->expires = parse_http_date(date);
/* kdo tohle napsal a proc ?? */
/*if (! cookie->expires) cookie->expires++;*/ /* no harm and we can use zero then */
- mem_free(date);
+ free(date);
} else {
cookie->expires = 0;
}
@@ -85,33 +85,33 @@ int set_cookie(struct terminal *term, unsigned char *url, unsigned char *str)
cookie->domain = idn_encode_host(dom, (int)strlen(cast_const_char dom), cast_uchar ".", 0);
if (!cookie->domain)
cookie->domain = stracpy(server);
- mem_free(dom);
+ free(dom);
}
if (cookie->domain[0] == '.') memmove(cookie->domain, cookie->domain + 1, strlen(cast_const_char cookie->domain));
if ((s = parse_header_param(str, cast_uchar "secure", 0))) {
cookie->secure = 1;
- mem_free(s);
+ free(s);
} else cookie->secure = 0;
if (!allow_cookie_domain(server, cookie->domain)) {
- mem_free(cookie->domain);
+ free(cookie->domain);
cookie->domain = stracpy(server);
}
foreach(struct c_server, cs, lcs, c_servers) if (!casestrcmp(cs->server, server)) {
if (cs->accpt) goto ok;
else {
free_cookie(cookie);
- mem_free(server);
+ free(server);
return 0;
}
}
if (accept_cookies != ACCEPT_ALL) {
free_cookie(cookie);
- mem_free(server);
+ free(server);
return 1;
}
ok:
accept_cookie(cookie);
- mem_free(server);
+ free(server);
return 0;
}
@@ -179,7 +179,7 @@ void add_cookies(unsigned char **s, int *l, unsigned char *url)
unsigned char *data = get_url_data(url);
if (data > url) data--;
foreach(struct c_domain, cd, lcd, c_domains) if (is_in_domain(cd->domain, server)) goto ok;
- mem_free(server);
+ free(server);
return;
ok:
foreachback(struct cookie, c, lc, all_cookies) if (is_in_domain(c->domain, server)) if (is_path_prefix(c->path, data)) {
@@ -199,7 +199,7 @@ void add_cookies(unsigned char **s, int *l, unsigned char *url)
}
}
if (nc) add_to_str(s, l, cast_uchar "\r\n");
- mem_free(server);
+ free(server);
}
void free_cookies(void)