diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-04-20 08:16:49 -0700 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-04-20 08:16:49 -0700 |
| commit | ad837700b86153be3587672124ee663c964f0f15 (patch) | |
| tree | 7ec6e8fbe539a169d501a3d1767644b68fab2dab /src/html.c | |
| parent | baeb17562f47dc31610c0f65079c45a7e6ad44bb (diff) | |
| download | rspamd-ad837700b86153be3587672124ee663c964f0f15.tar.gz rspamd-ad837700b86153be3587672124ee663c964f0f15.zip | |
Refactor memory pool naming.
Diffstat (limited to 'src/html.c')
| -rw-r--r-- | src/html.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/html.c b/src/html.c index cbec6e9d4..1f6d091d3 100644 --- a/src/html.c +++ b/src/html.c @@ -468,7 +468,7 @@ entity_cmp_num (const void *m1, const void *m2) } static GNode * -construct_html_node (memory_pool_t * pool, gchar *text, gsize tag_len) +construct_html_node (rspamd_mempool_t * pool, gchar *text, gsize tag_len) { struct html_node *html; GNode *n = NULL; @@ -479,7 +479,7 @@ construct_html_node (memory_pool_t * pool, gchar *text, gsize tag_len) return NULL; } - html = memory_pool_alloc0 (pool, sizeof (struct html_node)); + html = rspamd_mempool_alloc0 (pool, sizeof (struct html_node)); /* Check whether this tag is fully closed */ if (*(text + tag_len - 1) == '/') { @@ -712,7 +712,7 @@ check_phishing (struct worker_task *task, struct uri *href_url, const gchar *url } if (url_try_text (task->task_pool, url_text, len, NULL, NULL, &url_str, TRUE) && url_str != NULL) { - new = memory_pool_alloc0 (task->task_pool, sizeof (struct uri)); + new = rspamd_mempool_alloc0 (task->task_pool, sizeof (struct uri)); if (new != NULL) { g_strstrip (url_str); rc = parse_uri (new, url_str, task->task_pool); @@ -839,7 +839,7 @@ parse_tag_url (struct worker_task *task, struct mime_text_part *part, tag_id_t i return; } - url_text = memory_pool_alloc (task->task_pool, len + 1); + url_text = rspamd_mempool_alloc (task->task_pool, len + 1); rspamd_strlcpy (url_text, c, len + 1); decode_entitles (url_text, NULL); @@ -850,7 +850,7 @@ parse_tag_url (struct worker_task *task, struct mime_text_part *part, tag_id_t i return; } - url = memory_pool_alloc (task->task_pool, sizeof (struct uri)); + url = rspamd_mempool_alloc (task->task_pool, sizeof (struct uri)); rc = parse_uri (url, url_text, task->task_pool); if (rc != URI_ERRNO_EMPTY && rc != URI_ERRNO_NO_HOST && url->hostlen != 0) { @@ -869,7 +869,7 @@ parse_tag_url (struct worker_task *task, struct mime_text_part *part, tag_id_t i } gboolean -add_html_node (struct worker_task *task, memory_pool_t * pool, struct mime_text_part *part, +add_html_node (struct worker_task *task, rspamd_mempool_t * pool, struct mime_text_part *part, gchar *tag_text, gsize tag_len, gsize remain, GNode ** cur_level) { GNode *new; @@ -892,7 +892,7 @@ add_html_node (struct worker_task *task, memory_pool_t * pool, struct mime_text_ new = g_node_new (NULL); *cur_level = new; part->html_nodes = new; - memory_pool_add_destructor (pool, (pool_destruct_func) g_node_destroy, part->html_nodes); + rspamd_mempool_add_destructor (pool, (rspamd_mempool_destruct_t) g_node_destroy, part->html_nodes); /* Call once again with root node */ return add_html_node (task, pool, part, tag_text, tag_len, remain, cur_level); } |