[dovecot-cvs] dovecot/src/lib-storage/index index-storage.c, 1.60, 1.61

[cras at dovecot.org]

Update of /home/cvs/dovecot/src/lib-storage/index
In directory talvi:/tmp/cvs-serv13766/lib-storage/index

Modified Files:
	index-storage.c 
Log Message:
Better error message for unknown fields in mail*_cache_fields



Index: index-storage.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-storage.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- index-storage.c	23 Jul 2004 03:22:15 -0000	1.60
+++ index-storage.c	23 Jul 2004 18:38:35 -0000	1.61
@@ -174,7 +174,7 @@
 	destroy_unrefed(TRUE);
 }
 
-static void set_cache_decisions(const char *fields,
+static void set_cache_decisions(const char *set, const char *fields,
 				enum mail_cache_decision_type dec)
 {
 	const char *const *arr;
@@ -191,8 +191,8 @@
 			}
 		}
 		if (i == MAIL_CACHE_FIELD_COUNT) {
-			i_error("Invalid cache field name '%s', ignoring ",
-				*arr);
+			i_error("%s: Invalid cache field name '%s', ignoring ",
+				set, *arr);
 		}
 	}
 }
@@ -205,9 +205,10 @@
 	if (never_env == NULL)
 		never_env = DEFAULT_NEVER_CACHE_FIELDS;
 
-	set_cache_decisions(getenv("MAIL_CACHE_FIELDS"),
+	set_cache_decisions("mail_cache_fields", getenv("MAIL_CACHE_FIELDS"),
 			    MAIL_CACHE_DECISION_TEMP);
-	set_cache_decisions(never_env, MAIL_CACHE_DECISION_NO |
+	set_cache_decisions("mail_never_cache_fields", never_env,
+			    MAIL_CACHE_DECISION_NO |
 			    MAIL_CACHE_DECISION_FORCED);
 
 	mail_cache_register_fields(cache, cache_fields,