Mercurial > masqmail

changeset 405:0dd84c8f2524

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Broke long lines.
author markus schnalke <meillo@marmaro.de>
date Wed, 29 Feb 2012 10:28:23 +0100 (2012-02-29)
parents 899c97e877a5
children 8518fe2b0f36
files src/expand.c
diffstat 1 files changed, 32 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/expand.c	Wed Feb 29 10:21:58 2012 +0100
+++ b/src/expand.c	Wed Feb 29 10:28:23 2012 +0100
@@ -26,11 +26,14 @@
 {
 	gchar *tmp_str;
 
-	var_table = g_list_prepend(var_table, create_pair_string("rcpt_local", rcpt->local_part));
-	var_table = g_list_prepend(var_table, create_pair_string("rcpt_domain", rcpt->domain));
+	var_table = g_list_prepend(var_table,
+			create_pair_string("rcpt_local", rcpt->local_part));
+	var_table = g_list_prepend(var_table,
+			create_pair_string("rcpt_domain", rcpt->domain));
 
 	tmp_str = g_strdup_printf("%s@%s", rcpt->local_part, rcpt->domain);
-	var_table = g_list_prepend(var_table, create_pair_string("rcpt", tmp_str));
+	var_table = g_list_prepend(var_table,
+			create_pair_string("rcpt", tmp_str));
 	g_free(tmp_str);
 
 	return var_table;
@@ -42,14 +45,25 @@
 	address *ret_path = msg->return_path;
 	gchar *tmp_str;
 
-	var_table = g_list_prepend(var_table, create_pair_string("uid", msg->uid));
-	var_table = g_list_prepend(var_table, create_pair_string("received_host", msg->received_host ? msg->received_host : ""));
-	var_table = g_list_prepend(var_table, create_pair_string("ident", msg->ident ? msg->ident : ""));
-	var_table = g_list_prepend(var_table, create_pair_string("return_path_local", ret_path->local_part));
-	var_table = g_list_prepend(var_table, create_pair_string("return_path_domain", ret_path->domain));
+	var_table = g_list_prepend(var_table,
+			create_pair_string("uid", msg->uid));
+	var_table = g_list_prepend(var_table,
+			create_pair_string("received_host",
+			msg->received_host ? msg->received_host : ""));
+	var_table = g_list_prepend(var_table,
+			create_pair_string("ident",
+			msg->ident ? msg->ident : ""));
+	var_table = g_list_prepend(var_table,
+			create_pair_string("return_path_local",
+			ret_path->local_part));
+	var_table = g_list_prepend(var_table,
+			create_pair_string("return_path_domain",
+			ret_path->domain));
 
-	tmp_str = g_strdup_printf("%s@%s", ret_path->local_part, ret_path->domain);
-	var_table = g_list_prepend(var_table, create_pair_string("return_path", tmp_str));
+	tmp_str = g_strdup_printf("%s@%s",
+			ret_path->local_part, ret_path->domain);
+	var_table = g_list_prepend(var_table,
+			create_pair_string("return_path", tmp_str));
 	g_free(tmp_str);
 
 	return var_table;
@@ -58,9 +72,12 @@
 GList*
 var_table_conf(GList *var_table)
 {
-	var_table = g_list_prepend(var_table, create_pair_string("host_name", conf.host_name));
-	var_table = g_list_prepend(var_table, create_pair_string("package", PACKAGE));
-	var_table = g_list_prepend(var_table, create_pair_string("version", VERSION));
+	var_table = g_list_prepend(var_table,
+			create_pair_string("host_name", conf.host_name));
+	var_table = g_list_prepend(var_table,
+			create_pair_string("package", PACKAGE));
+	var_table = g_list_prepend(var_table,
+			create_pair_string("version", VERSION));
 
 	return var_table;
 }
@@ -92,7 +109,8 @@
 				p++;
 			} else {
 				/* $var style */
-				while (*p && (isalnum(*p) || (*p == '_') || (*p == '-')) && (j < MAX_VAR)) {
+				while (*p && (isalnum(*p) || (*p=='_') ||
+						(*p=='-')) && (j < MAX_VAR)) {
 					*(vq++) = *(p++);
 					j++;
 				}