changeset 10025:6556754b6c24 HEAD

Comment update.
author Timo Sirainen <tss@iki.fi>
date Fri, 09 Oct 2009 18:45:29 -0400
parents 85e532d170cc
children 4442b6aa5a66
files src/lib-settings/settings-parser.h
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-settings/settings-parser.h	Fri Oct 09 18:45:21 2009 -0400
+++ b/src/lib-settings/settings-parser.h	Fri Oct 09 18:45:29 2009 -0400
@@ -169,7 +169,7 @@
 
 /* Copy changed settings from src to dest. If conflict_key_r is not NULL and
    both src and dest have changed the same setting, return -1 and set the
-   key name. */
+   key name. If it's NULL, the old setting is kept. */
 int settings_parser_apply_changes(struct setting_parser_context *dest,
 				  const struct setting_parser_context *src,
 				  pool_t pool, const char **conflict_key_r);