Mercurial > masqmail
changeset 343:9149d893eb52
refactoring: ``insourced'' create_msg_out_list()
The function is only four lines and used only once.
It's simpler to have the four lines just at the actual place.
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Sat, 03 Sep 2011 18:25:02 +0200 (2011-09-03) |
| parents | 3f1eecd8082d |
| children | 0410c8aabac2 |
| files | src/deliver.c src/masqmail.h src/message.c |
| diffstat | 3 files changed, 9 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/deliver.c Wed Aug 31 09:39:40 2011 +0200 +++ b/src/deliver.c Sat Sep 03 18:25:02 2011 +0200 @@ -729,7 +729,8 @@ gboolean deliver_msg_list(GList * msg_list, guint flags) { - GList *msgout_list = create_msg_out_list(msg_list); + GList *msgout_list = NULL; + GList *msg_node; GList *local_msgout_list = NULL; GList *localnet_msgout_list = NULL; GList *other_msgout_list = NULL; @@ -737,6 +738,13 @@ GList *alias_table = NULL; gboolean ok = TRUE; + /* create msgout_list */ + foreach(msg_list, msg_node) { + message *msg = (message *) msg_node->data; + msgout_list = g_list_append(msgout_list, create_msg_out(msg)); + } + + if (conf.alias_file) { alias_table = table_read(conf.alias_file, ':'); }
--- a/src/masqmail.h Wed Aug 31 09:39:40 2011 +0200 +++ b/src/masqmail.h Sat Sep 03 18:25:02 2011 +0200 @@ -365,7 +365,6 @@ msg_out *create_msg_out(message * msg); msg_out *clone_msg_out(msg_out * msgout_orig); -GList *create_msg_out_list(GList * msg_list); void destroy_msg_out(msg_out * msgout); void destroy_msg_out_list(GList * msgout_list);
--- a/src/message.c Wed Aug 31 09:39:40 2011 +0200 +++ b/src/message.c Sat Sep 03 18:25:02 2011 +0200 @@ -200,19 +200,6 @@ return NULL; } -GList* -create_msg_out_list(GList * msg_list) -{ - GList *msgout_list = NULL; - GList *msg_node; - - foreach(msg_list, msg_node) { - message *msg = (message *) (msg_node->data); - msgout_list = g_list_append(msgout_list, create_msg_out(msg)); - } - return msgout_list; -} - void destroy_msg_out(msg_out * msgout) {