masqmail
diff src/masqmail.h @ 366:41958685480d
Switched to `type *name' style
Andrew Koenig's ``C Traps and Pitfalls'' (Ch.2.1) convinced
me that it is best to go with the way C had been designed.
The ``declaration reflects use'' concept conflicts with a
``type* name'' notation. Hence I switched.
author | markus schnalke <meillo@marmaro.de> |
---|---|
date | Thu, 22 Sep 2011 15:07:40 +0200 |
parents | f4ba4ed28848 |
children | b27f66555ba8 |
line diff
1.1 --- a/src/masqmail.h Wed Sep 14 12:20:40 2011 +0200 1.2 +++ b/src/masqmail.h Thu Sep 22 15:07:40 2011 +0200 1.3 @@ -333,106 +333,106 @@ 1.4 } smtp_connection; 1.5 1.6 /* alias.c*/ 1.7 -gboolean addr_is_local(address * addr); 1.8 -GList *alias_expand(GList * alias_table, GList * rcpt_list, GList * non_rcpt_list); 1.9 +gboolean addr_is_local(address *addr); 1.10 +GList *alias_expand(GList *alias_table, GList *rcpt_list, GList *non_rcpt_list); 1.11 1.12 /* child.c */ 1.13 int child(const char *command); 1.14 1.15 /* conf.c */ 1.16 void init_conf(); 1.17 -gboolean read_conf(gchar * filename); 1.18 -connect_route *read_route(gchar * filename, gboolean is_perma); 1.19 -GList *read_route_list(GList * rf_list, gboolean is_perma); 1.20 -void destroy_route(connect_route * r); 1.21 -void destroy_route_list(GList * list); 1.22 +gboolean read_conf(gchar *filename); 1.23 +connect_route *read_route(gchar *filename, gboolean is_perma); 1.24 +GList *read_route_list(GList *rf_list, gboolean is_perma); 1.25 +void destroy_route(connect_route *r); 1.26 +void destroy_route_list(GList *list); 1.27 1.28 /* expand.c */ 1.29 -GList *var_table_rcpt(GList * var_table, address * rcpt); 1.30 -GList *var_table_msg(GList * var_table, message * msg); 1.31 -GList *var_table_conf(GList * var_table); 1.32 -gint expand(GList * var_list, gchar * format, gchar * result, gint result_len); 1.33 +GList *var_table_rcpt(GList *var_table, address *rcpt); 1.34 +GList *var_table_msg(GList *var_table, message *msg); 1.35 +GList *var_table_conf(GList *var_table); 1.36 +gint expand(GList *var_list, gchar *format, gchar *result, gint result_len); 1.37 1.38 /* message.c */ 1.39 message *create_message(void); 1.40 -void destroy_message(message * msg); 1.41 -void destroy_msg_list(GList * msg_list); 1.42 -void msg_free_data(message * msg); 1.43 -gint msg_calc_size(message * msg, gboolean is_smtp); 1.44 +void destroy_message(message *msg); 1.45 +void destroy_msg_list(GList *msg_list); 1.46 +void msg_free_data(message *msg); 1.47 +gint msg_calc_size(message *msg, gboolean is_smtp); 1.48 1.49 -msg_out *create_msg_out(message * msg); 1.50 -msg_out *clone_msg_out(msg_out * msgout_orig); 1.51 -void destroy_msg_out(msg_out * msgout); 1.52 -void destroy_msg_out_list(GList * msgout_list); 1.53 +msg_out *create_msg_out(message *msg); 1.54 +msg_out *clone_msg_out(msg_out *msgout_orig); 1.55 +void destroy_msg_out(msg_out *msgout); 1.56 +void destroy_msg_out_list(GList *msgout_list); 1.57 1.58 /* address.c */ 1.59 -address *create_address(gchar * path, gboolean is_rfc821); 1.60 -address *create_address_qualified(gchar * path, gboolean is_rfc821, gchar * domain); 1.61 -address *create_address_pipe(gchar * path); 1.62 -void destroy_address(address * addr); 1.63 -address *copy_modify_address(const address * orig, gchar * l_part, gchar * dom); 1.64 +address *create_address(gchar *path, gboolean is_rfc821); 1.65 +address *create_address_qualified(gchar *path, gboolean is_rfc821, gchar *domain); 1.66 +address *create_address_pipe(gchar *path); 1.67 +void destroy_address(address *addr); 1.68 +address *copy_modify_address(const address *orig, gchar *l_part, gchar *dom); 1.69 #define copy_address(addr) copy_modify_address(addr, NULL, NULL) 1.70 -gboolean addr_isequal(address * addr1, address * addr2, int (*cmpfunc) (const char*, const char*)); 1.71 -gboolean addr_isequal_parent(address * addr1, address * addr2, int (*cmpfunc) (const char*, const char*)); 1.72 -address *addr_find_ancestor(address * addr); 1.73 -gboolean addr_is_delivered_children(address * addr); 1.74 -gboolean addr_is_finished_children(address * addr); 1.75 -gchar *addr_string(address * addr); 1.76 +gboolean addr_isequal(address *addr1, address *addr2, int (*cmpfunc) (const char*, const char*)); 1.77 +gboolean addr_isequal_parent(address *addr1, address *addr2, int (*cmpfunc) (const char*, const char*)); 1.78 +address *addr_find_ancestor(address *addr); 1.79 +gboolean addr_is_delivered_children(address *addr); 1.80 +gboolean addr_is_finished_children(address *addr); 1.81 +gchar *addr_string(address *addr); 1.82 1.83 /* accept.c */ 1.84 -accept_error accept_message(FILE * in, message * msg, guint flags); 1.85 -accept_error accept_message_prepare(message * msg, guint flags); 1.86 +accept_error accept_message(FILE *in, message *msg, guint flags); 1.87 +accept_error accept_message_prepare(message *msg, guint flags); 1.88 1.89 /* header.c */ 1.90 gchar *rec_timestamp(); 1.91 -GList *find_header(GList * hdr_list, header_id id, gchar * hdr_str); 1.92 -void header_unfold(header * hdr); 1.93 -void header_fold(header * hdr, unsigned int maxlen); 1.94 -header *create_header(header_id id, gchar * fmt, ...); 1.95 -void destroy_header(header * hdr); 1.96 -header *copy_header(header * hdr); 1.97 -header *get_header(gchar * line); 1.98 +GList *find_header(GList *hdr_list, header_id id, gchar *hdr_str); 1.99 +void header_unfold(header *hdr); 1.100 +void header_fold(header *hdr, unsigned int maxlen); 1.101 +header *create_header(header_id id, gchar *fmt, ...); 1.102 +void destroy_header(header *hdr); 1.103 +header *copy_header(header *hdr); 1.104 +header *get_header(gchar *line); 1.105 1.106 /* smtp_in.c */ 1.107 -void smtp_in(FILE * in, FILE * out, gchar * remote_host, gchar * ident); 1.108 +void smtp_in(FILE *in, FILE *out, gchar *remote_host, gchar *ident); 1.109 1.110 /* listen.c */ 1.111 -void listen_port(GList * addr_list, gint qival, char *argv[]); 1.112 +void listen_port(GList *addr_list, gint qival, char *argv[]); 1.113 1.114 /* parse.c */ 1.115 -gboolean split_address(const gchar * path, gchar ** local_part, gchar ** domain, gboolean is_rfc821); 1.116 -gboolean parse_address_rfc822(gchar * string, gchar ** local_begin, gchar ** local_end, gchar ** domain_begin, gchar ** domain_end, gchar ** address_end); 1.117 -gboolean parse_address_rfc821(gchar * string, gchar ** local_begin, gchar ** local_end, gchar ** domain_begin, gchar ** domain_end, gchar ** address_end); 1.118 -address *_create_address(gchar * string, gchar ** end, gboolean is_rfc821); 1.119 -address *create_address_rfc821(gchar * string, gchar ** end); 1.120 -address *create_address_rfc822(gchar * string, gchar ** end); 1.121 -GList *addr_list_append_rfc822(GList * addr_list, gchar * string, gchar * domain); 1.122 +gboolean split_address(const gchar *path, gchar **local_part, gchar **domain, gboolean is_rfc821); 1.123 +gboolean parse_address_rfc822(gchar *string, gchar **local_begin, gchar **local_end, gchar **domain_begin, gchar **domain_end, gchar **address_end); 1.124 +gboolean parse_address_rfc821(gchar *string, gchar **local_begin, gchar **local_end, gchar **domain_begin, gchar **domain_end, gchar **address_end); 1.125 +address *_create_address(gchar *string, gchar **end, gboolean is_rfc821); 1.126 +address *create_address_rfc821(gchar *string, gchar **end); 1.127 +address *create_address_rfc822(gchar *string, gchar **end); 1.128 +GList *addr_list_append_rfc822(GList *addr_list, gchar *string, gchar *domain); 1.129 1.130 /* connect.c */ 1.131 -mxip_addr *connect_hostlist(int *psockfd, gchar * host, guint port, GList * addr_list); 1.132 -mxip_addr *connect_resolvelist(int *psockfd, gchar * host, guint port, GList * res_funcs); 1.133 +mxip_addr *connect_hostlist(int *psockfd, gchar *host, guint port, GList *addr_list); 1.134 +mxip_addr *connect_resolvelist(int *psockfd, gchar *host, guint port, GList *res_funcs); 1.135 1.136 /* deliver.c */ 1.137 -void msg_rcptlist_local(GList * rcpt_list, GList **, GList **); 1.138 -gboolean deliver_local(msg_out * msgout); 1.139 -gboolean deliver_msglist_host(connect_route * route, GList * msg_list, gchar * host, GList * res_list); 1.140 -gboolean deliver_route_msgout_list(connect_route * route, GList * msgout_list); 1.141 -gboolean deliver_route_msg_list(connect_route * route, GList * msgout_list); 1.142 -gboolean deliver_finish(msg_out * msgout); 1.143 -gboolean deliver_msg_list(GList * msg_list, guint flags); 1.144 -gboolean deliver(message * msg); 1.145 +void msg_rcptlist_local(GList *rcpt_list, GList **, GList **); 1.146 +gboolean deliver_local(msg_out *msgout); 1.147 +gboolean deliver_msglist_host(connect_route *route, GList *msg_list, gchar *host, GList *res_list); 1.148 +gboolean deliver_route_msgout_list(connect_route *route, GList *msgout_list); 1.149 +gboolean deliver_route_msg_list(connect_route *route, GList *msgout_list); 1.150 +gboolean deliver_finish(msg_out *msgout); 1.151 +gboolean deliver_msg_list(GList *msg_list, guint flags); 1.152 +gboolean deliver(message *msg); 1.153 1.154 /* fail_msg.c */ 1.155 -gboolean fail_msg(message * msg, gchar * template, GList * failed_rcpts, gchar * err_fmt, va_list args); 1.156 -gboolean warn_msg(message * msg, gchar * template, GList * failed_rcpts, gchar * err_fmt, va_list args); 1.157 +gboolean fail_msg(message *msg, gchar *template, GList *failed_rcpts, gchar *err_fmt, va_list args); 1.158 +gboolean warn_msg(message *msg, gchar *template, GList *failed_rcpts, gchar *err_fmt, va_list args); 1.159 1.160 /* interface.c */ 1.161 -gboolean init_sockaddr(struct sockaddr_in *name, interface * iface); 1.162 -int make_server_socket(interface * iface); 1.163 +gboolean init_sockaddr(struct sockaddr_in *name, interface *iface); 1.164 +int make_server_socket(interface *iface); 1.165 1.166 /* local.c */ 1.167 -gboolean append_file(message * msg, GList * hdr_list, gchar * user); 1.168 -gboolean pipe_out(message * msg, GList * hdr_list, address * rcpt, gchar * cmd, guint flags); 1.169 +gboolean append_file(message *msg, GList *hdr_list, gchar *user); 1.170 +gboolean pipe_out(message *msg, GList *hdr_list, address *rcpt, gchar *cmd, guint flags); 1.171 1.172 /* log.c */ 1.173 gchar *ext_strerror(int err); 1.174 @@ -445,58 +445,58 @@ 1.175 void maillog(const char *fmt, ...); 1.176 1.177 /* spool.c */ 1.178 -gboolean spool_read_data(message * msg); 1.179 -message *msg_spool_read(gchar * uid); 1.180 -gboolean spool_write(message * msg, gboolean do_writedata); 1.181 -gboolean spool_lock(gchar * uid); 1.182 -gboolean spool_unlock(gchar * uid); 1.183 -gboolean spool_delete_all(message * msg); 1.184 +gboolean spool_read_data(message *msg); 1.185 +message *msg_spool_read(gchar *uid); 1.186 +gboolean spool_write(message *msg, gboolean do_writedata); 1.187 +gboolean spool_lock(gchar *uid); 1.188 +gboolean spool_unlock(gchar *uid); 1.189 +gboolean spool_delete_all(message *msg); 1.190 1.191 /* queue.c */ 1.192 GList *read_queue(void); 1.193 gboolean queue_run(void); 1.194 gboolean queue_run_online(void); 1.195 void queue_list(void); 1.196 -gboolean queue_delete(gchar * uid); 1.197 +gboolean queue_delete(gchar *uid); 1.198 1.199 /* online.c */ 1.200 gchar *online_query(); 1.201 1.202 /* permissions.c */ 1.203 gboolean is_ingroup(uid_t uid, gid_t gid); 1.204 -void set_euidgid(gint uid, gint gid, uid_t * old_uid, gid_t * old_gid); 1.205 -void set_identity(uid_t old_uid, gchar * task_name); 1.206 +void set_euidgid(gint uid, gint gid, uid_t *old_uid, gid_t *old_gid); 1.207 +void set_identity(uid_t old_uid, gchar *task_name); 1.208 1.209 /* rewrite.c */ 1.210 -gboolean set_address_header_domain(header * hdr, gchar * domain); 1.211 -gboolean map_address_header(header * hdr, GList * table); 1.212 +gboolean set_address_header_domain(header *hdr, gchar *domain); 1.213 +gboolean map_address_header(header *hdr, GList *table); 1.214 1.215 /* route.c */ 1.216 -msgout_perhost *create_msgout_perhost(gchar * host); 1.217 -void destroy_msgout_perhost(msgout_perhost * mo_ph); 1.218 -void rewrite_headers(msg_out * msgout, connect_route * route); 1.219 -void split_rcpts(GList* rcpt_list, GList* localnets, GList** rl_local, GList** rl_localnet, GList** rl_others); 1.220 -GList* local_rcpts(GList* rcpt_list); 1.221 -GList* remote_rcpts(GList* rcpt_list); 1.222 -gboolean route_strip_msgout(connect_route * route, msg_out * msgout); 1.223 -msg_out *route_prepare_msgout(connect_route * route, msg_out * msgout); 1.224 -GList *route_msgout_list(connect_route * route, GList * msgout_list); 1.225 -gboolean route_sender_is_allowed(connect_route * route, address * ret_path); 1.226 -void route_split_rcpts(connect_route * route, GList * rcpt_list, GList ** p_rcpt_list, GList ** p_non_rcpt_list); 1.227 +msgout_perhost *create_msgout_perhost(gchar *host); 1.228 +void destroy_msgout_perhost(msgout_perhost *mo_ph); 1.229 +void rewrite_headers(msg_out *msgout, connect_route *route); 1.230 +void split_rcpts(GList *rcpt_list, GList *localnets, GList **rl_local, GList **rl_localnet, GList **rl_others); 1.231 +GList *local_rcpts(GList *rcpt_list); 1.232 +GList *remote_rcpts(GList *rcpt_list); 1.233 +gboolean route_strip_msgout(connect_route *route, msg_out *msgout); 1.234 +msg_out *route_prepare_msgout(connect_route *route, msg_out *msgout); 1.235 +GList *route_msgout_list(connect_route *route, GList *msgout_list); 1.236 +gboolean route_sender_is_allowed(connect_route *route, address *ret_path); 1.237 +void route_split_rcpts(connect_route *route, GList *rcpt_list, GList **p_rcpt_list, GList **p_non_rcpt_list); 1.238 1.239 /* tables.c */ 1.240 -table_pair *create_pair(gchar * key, gpointer value); 1.241 -table_pair *create_pair_string(gchar * key, gpointer value); 1.242 -table_pair *parse_table_pair(gchar * line, char delim); 1.243 -gpointer *table_find_func(GList * table_list, gchar * key, int (*cmp_func) (const char *, const char *)); 1.244 -gpointer *table_find(GList * table_list, gchar * key); 1.245 -gpointer *table_find_case(GList * table_list, gchar * key); 1.246 -gpointer *table_find_fnmatch(GList * table_list, gchar * key); 1.247 -GList *table_read(gchar * fname, gchar delim); 1.248 -void destroy_table(GList * table); 1.249 +table_pair *create_pair(gchar *key, gpointer value); 1.250 +table_pair *create_pair_string(gchar *key, gpointer value); 1.251 +table_pair *parse_table_pair(gchar *line, char delim); 1.252 +gpointer *table_find_func(GList *table_list, gchar *key, int (*cmp_func) (const char *, const char *)); 1.253 +gpointer *table_find(GList *table_list, gchar *key); 1.254 +gpointer *table_find_case(GList *table_list, gchar *key); 1.255 +gpointer *table_find_fnmatch(GList *table_list, gchar *key); 1.256 +GList *table_read(gchar *fname, gchar delim); 1.257 +void destroy_table(GList *table); 1.258 1.259 /* timeival.c */ 1.260 -gint time_interval(gchar * str); 1.261 +gint time_interval(gchar *str); 1.262 1.263 /* permissions.c */ 1.264 gboolean is_privileged_user(uid_t uid);