Rework http chunked encoding parsing.

2 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/regexp.c b/src/plugins/regexp.c
index a82c60110..d2e22a14a 100644
--- a/src/plugins/regexp.c
+++ b/src/plugins/regexp.c
@@ -66,8 +66,8 @@ struct regexp_ctx {
 };
 
 struct regexp_json_buf {
-	guint8                         *buf;
-	guint8                         *pos;
+	gchar                          *buf;
+	gchar                          *pos;
 	size_t                          buflen;
 	struct config_file             *cfg;
 };
@@ -142,7 +142,7 @@ op_less_equal (gint a, gint b)
 static gboolean
 parse_regexp_ipmask (const gchar *begin, struct dynamic_map_item *addr)
 {
-	const gchar *pos;
+	const gchar                    *pos;
 	gchar                           ip_buf[sizeof ("255.255.255.255")], mask_buf[3], *p;
 	gint                            state = 0, dots = 0;
 	
@@ -252,8 +252,8 @@ read_regexp_expression (memory_pool_t * pool, struct regexp_module_item *chain,
 
 
 /* Callbacks for reading json dynamic rules */
-guint8                         *
-json_regexp_read_cb (memory_pool_t * pool, guint8 * chunk, size_t len, struct map_cb_data *data)
+gchar                         *
+json_regexp_read_cb (memory_pool_t * pool, gchar * chunk, size_t len, struct map_cb_data *data)
 {
 	struct regexp_json_buf                *jb;
 	size_t                          free, off;
diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index 6b61caf62..ba4559015 100644
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -100,8 +100,8 @@ exception_insert (gpointer st, gconstpointer key, gpointer value)
 	g_hash_table_insert (t[level], val, value);
 }
 
-static u_char *
-read_exceptions_list (memory_pool_t * pool, u_char * chunk, size_t len, struct map_cb_data *data)
+static gchar *
+read_exceptions_list (memory_pool_t * pool, gchar * chunk, size_t len, struct map_cb_data *data)
 {
 	if (data->cur_data == NULL) {
 		data->cur_data = memory_pool_alloc0 (pool, sizeof (GHashTable *) * MAX_LEVELS);
@@ -174,8 +174,8 @@ redirector_item_free (gpointer p)
 	}
 }
 
-static u_char                         *
-read_redirectors_list (memory_pool_t * pool, u_char * chunk, size_t len, struct map_cb_data *data)
+static gchar                         *
+read_redirectors_list (memory_pool_t * pool, gchar * chunk, size_t len, struct map_cb_data *data)
 {
 	if (data->cur_data == NULL) {
 		data->cur_data = g_hash_table_new_full (rspamd_strcase_hash, rspamd_strcase_equal, g_free, redirector_item_free);
@@ -792,7 +792,7 @@ register_memcached_call (struct uri *url, struct worker_task *task, struct suffi
 
 	param->ctx = memory_pool_alloc0 (task->task_pool, sizeof (memcached_ctx_t));
 
-	cur_param->buf = (u_char *) url_count;
+	cur_param->buf = (gchar *) url_count;
 	cur_param->bufsize = sizeof (gint);
 
 	sum_str = g_compute_checksum_for_string (G_CHECKSUM_MD5, struri (url), -1);