diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-07-23 12:53:08 +0100 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-07-23 12:53:08 +0100 |
commit | fe79d8c5a39f2b717f78cc3f3ef21b3cfc46500b (patch) | |
tree | c84e6a5d4c5cd78a7a2cc3c7adbc7af5d0541682 /src/libutil/map.h | |
parent | e0483657ff6cf1adc828ccce457814d61fe90a0d (diff) | |
download | rspamd-fe79d8c5a39f2b717f78cc3f3ef21b3cfc46500b.tar.gz rspamd-fe79d8c5a39f2b717f78cc3f3ef21b3cfc46500b.zip |
Revert "Unify code style."
This reverts commit e0483657ff6cf1adc828ccce457814d61fe90a0d.
Diffstat (limited to 'src/libutil/map.h')
-rw-r--r-- | src/libutil/map.h | 37 |
1 files changed, 9 insertions, 28 deletions
diff --git a/src/libutil/map.h b/src/libutil/map.h index 1b5c01f1e..ddb9882e4 100644 --- a/src/libutil/map.h +++ b/src/libutil/map.h @@ -34,7 +34,7 @@ struct http_map_data { gchar *host; time_t last_checked; gshort chunked; - gchar read_buf[BUFSIZ]; + gchar read_buf[BUFSIZ]; guint32 rlen; guint32 chunk; guint32 chunk_remain; @@ -45,8 +45,7 @@ struct map_cb_data; /** * Callback types */ -typedef gchar * (*map_cb_t)(rspamd_mempool_t *pool, gchar *chunk, gint len, - struct map_cb_data *data); +typedef gchar* (*map_cb_t)(rspamd_mempool_t *pool, gchar *chunk, gint len, struct map_cb_data *data); typedef void (*map_fin_cb_t)(rspamd_mempool_t *pool, struct map_cb_data *data); /** @@ -90,12 +89,8 @@ gboolean check_map_proto (const gchar *map_line, gint *res, const gchar **pos); /** * Add map from line */ -gboolean add_map (struct rspamd_config *cfg, - const gchar *map_line, - const gchar *description, - map_cb_t read_callback, - map_fin_cb_t fin_callback, - void **user_data); +gboolean add_map (struct rspamd_config *cfg, const gchar *map_line, const gchar *description, + map_cb_t read_callback, map_fin_cb_t fin_callback, void **user_data); /** * Start watching of maps by adding events to libevent event loop @@ -107,8 +102,7 @@ void start_map_watch (struct rspamd_config *cfg, struct event_base *ev_base); */ void remove_all_maps (struct rspamd_config *cfg); -typedef void (*insert_func) (gpointer st, gconstpointer key, - gconstpointer value); +typedef void (*insert_func) (gpointer st, gconstpointer key, gconstpointer value); /** * Common callbacks for frequent types of lists @@ -117,37 +111,24 @@ typedef void (*insert_func) (gpointer st, gconstpointer key, /** * Radix list is a list like ip/mask */ -gchar * read_radix_list (rspamd_mempool_t *pool, - gchar *chunk, - gint len, - struct map_cb_data *data); +gchar* read_radix_list (rspamd_mempool_t *pool, gchar *chunk, gint len, struct map_cb_data *data); void fin_radix_list (rspamd_mempool_t *pool, struct map_cb_data *data); /** * Host list is an ordinal list of hosts or domains */ -gchar * read_host_list (rspamd_mempool_t *pool, - gchar *chunk, - gint len, - struct map_cb_data *data); +gchar* read_host_list (rspamd_mempool_t *pool, gchar *chunk, gint len, struct map_cb_data *data); void fin_host_list (rspamd_mempool_t *pool, struct map_cb_data *data); /** * Kv list is an ordinal list of keys and values separated by whitespace */ -gchar * read_kv_list (rspamd_mempool_t *pool, - gchar *chunk, - gint len, - struct map_cb_data *data); +gchar* read_kv_list (rspamd_mempool_t *pool, gchar *chunk, gint len, struct map_cb_data *data); void fin_kv_list (rspamd_mempool_t *pool, struct map_cb_data *data); /** * FSM for lists parsing (support comments, blank lines and partial replies) */ -gchar * abstract_parse_list (rspamd_mempool_t * pool, - gchar * chunk, - gint len, - struct map_cb_data *data, - insert_func func); +gchar * abstract_parse_list (rspamd_mempool_t * pool, gchar * chunk, gint len, struct map_cb_data *data, insert_func func); #endif |