[Openais] [PATCH] corosync/trunk: revert config_verifyconf API

[Fabio M. Di Nitto]

Hi,

in the reload config implementation we originally thought that a verify 
config call was required.

After more brainstorming, we got to the conclusion that it is useless.

Patch in attachment removes it.

Fabio

--
I'm going to make him an offer he can't refuse.
-------------- next part --------------
Index: exec/config.h
===================================================================
--- exec/config.h	(revision 1630)
+++ exec/config.h	(working copy)
@@ -38,7 +38,6 @@
 struct config_iface_ver0 {
 	int (*config_readconfig) (struct objdb_iface_ver0 *objdb, char **error_string);
 	int (*config_writeconfig) (struct objdb_iface_ver0 *objdb, char **error_string);
-	int (*config_verifyconfig) (struct objdb_iface_ver0 *objdb, char **error_string);
 	int (*config_reloadconfig) (struct objdb_iface_ver0 *objdb, int flush, char **error_string);
 };
 
Index: exec/objdb.c
===================================================================
--- exec/objdb.c	(revision 1630)
+++ exec/objdb.c	(working copy)
@@ -1424,18 +1424,7 @@
 
 	main_get_config_modules(&modules, &num_modules);
 
-	/* phase 1. Each module should verify that it can reload the config
-	 * and error out here if possible at all
-	 */
 	for (i=0; i<num_modules; i++) {
-		if (modules[i]->config_verifyconfig) {
-			res = modules[i]->config_verifyconfig(&objdb_iface, error_string);
-			if (res)
-				return res;
-		}
-	}
-	/* phase 2. Do it.. */
-	for (i=0; i<num_modules; i++) {
 		if (modules[i]->config_reloadconfig) {
 			res = modules[i]->config_reloadconfig(&objdb_iface, flush, error_string);
 			if (res)