ctdb-conf: Move conf.[ch] to conf/ subdirectory

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/ctdb/conf/cluster_conf.c b/ctdb/conf/cluster_conf.c
index a5cebf46ea0eb065366f411df231aeeb761f73b9..b49a24400265a6eac0737b9df1b4e67068878ba7 100644 (file)
--- a/ctdb/conf/cluster_conf.c
+++ b/ctdb/conf/cluster_conf.c
@@ -22,7 +22,7 @@
 
 #include "lib/util/debug.h"
 
-#include "common/conf.h"
+#include "conf/conf.h"
 
 #include "conf/cluster_conf.h"
 

diff --git a/ctdb/conf/cluster_conf.h b/ctdb/conf/cluster_conf.h
index 38c378fd57185d7d2e3b1e5019b32065bd3626a3..9775b6fc080f420c4dc79842e0c2fbff709a63e0 100644 (file)
--- a/ctdb/conf/cluster_conf.h
+++ b/ctdb/conf/cluster_conf.h
@@ -20,7 +20,7 @@
 #ifndef __CTDB_CLUSTER_CONF_H__
 #define __CTDB_CLUSTER_CONF_H__
 
-#include "common/conf.h"
+#include "conf/conf.h"
 
 #define CLUSTER_CONF_SECTION "cluster"
 

diff --git a/ctdb/common/conf.c b/ctdb/conf/conf.c
similarity index 99%
rename from ctdb/common/conf.c
rename to ctdb/conf/conf.c
index a8ff724e73fc1e0adba2293f062d25444c5cd76c..67046c715e24fe692caed2c0785377762b89079f 100644 (file)
--- a/ctdb/common/conf.c
+++ b/ctdb/conf/conf.c
@@ -26,7 +26,7 @@
 #include "lib/util/tini.h"
 #include "lib/util/debug.h"
 
-#include "common/conf.h"
+#include "conf/conf.h"
 
 struct conf_value {
        enum conf_type type;

diff --git a/ctdb/common/conf.h b/ctdb/conf/conf.h
similarity index 100%
rename from ctdb/common/conf.h
rename to ctdb/conf/conf.h

diff --git a/ctdb/conf/conf_tool.c b/ctdb/conf/conf_tool.c
index 797d9c77630201d073a63681264dfac52f7be9ce..28f6c1090d007779af58f0a2a3d9461d597d5941 100644 (file)
--- a/ctdb/conf/conf_tool.c
+++ b/ctdb/conf/conf_tool.c
@@ -25,9 +25,9 @@
 
 #include "common/logging.h"
 #include "common/cmdline.h"
-#include "common/conf.h"
 #include "common/path.h"
 
+#include "conf/conf.h"
 #include "conf/logging_conf.h"
 #include "conf/cluster_conf.h"
 #include "conf/database_conf.h"

diff --git a/ctdb/conf/ctdb_config.c b/ctdb/conf/ctdb_config.c
index a97dfd59284acb0fa5860b9be84ccb1e879e06d6..1e7fa72fa59b430eaced5ce569b43b8521d1e2a9 100644 (file)
--- a/ctdb/conf/ctdb_config.c
+++ b/ctdb/conf/ctdb_config.c
@@ -22,8 +22,8 @@
 #include "lib/util/debug.h"
 
 #include "common/path.h"
-#include "common/conf.h"
 
+#include "conf/conf.h"
 #include "conf/logging_conf.h"
 #include "conf/cluster_conf.h"
 #include "conf/database_conf.h"

diff --git a/ctdb/conf/ctdb_config.h b/ctdb/conf/ctdb_config.h
index 7ccda7d5d53d5b0be7c5c98c8ab393d82d3c35bf..99f676c5cccb0bf609f144681ab0cb0ac3e14120 100644 (file)
--- a/ctdb/conf/ctdb_config.h
+++ b/ctdb/conf/ctdb_config.h
@@ -20,7 +20,7 @@
 #ifndef __CTDB_CONFIG_H__
 #define __CTDB_CONFIG_H__
 
-#include "common/conf.h"
+#include "conf/conf.h"
 
 struct ctdb_config {
        /* Cluster */

diff --git a/ctdb/conf/database_conf.c b/ctdb/conf/database_conf.c
index 78510e0f2cd924b81572843995655b7a06fca888..2d0d705ed4a57b08101284a70509be5f21667966 100644 (file)
--- a/ctdb/conf/database_conf.c
+++ b/ctdb/conf/database_conf.c
@@ -29,9 +29,9 @@
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
 
-#include "common/conf.h"
 #include "common/path.h"
 
+#include "conf/conf.h"
 #include "conf/database_conf.h"
 
 #define DATABASE_CONF_VOLATILE_DB_DIR_DEFAULT   CTDB_VARDIR "/volatile"

diff --git a/ctdb/conf/database_conf.h b/ctdb/conf/database_conf.h
index 6fa579c150211e70b56bef025cccde2267f18baa..e8baffd578dadf39d802215019390311f53ba0e0 100644 (file)
--- a/ctdb/conf/database_conf.h
+++ b/ctdb/conf/database_conf.h
@@ -20,7 +20,7 @@
 #ifndef __CTDB_DATABASE_CONF_H__
 #define __CTDB_DATABASE_CONF_H__
 
-#include "common/conf.h"
+#include "conf/conf.h"
 
 #define DATABASE_CONF_SECTION "database"
 

diff --git a/ctdb/conf/event_conf.c b/ctdb/conf/event_conf.c
index 8bb2c1dab49c9e9945b18564d104561e54acb800..6b2aeb76c28cca8ba60726e36920445ed0cb308a 100644 (file)
--- a/ctdb/conf/event_conf.c
+++ b/ctdb/conf/event_conf.c
@@ -23,9 +23,9 @@
 
 #include "lib/util/debug.h"
 
-#include "common/conf.h"
 #include "common/path.h"
 
+#include "conf/conf.h"
 #include "conf/event_conf.h"
 
 static bool event_conf_validate_debug_script(const char *key,

diff --git a/ctdb/conf/event_conf.h b/ctdb/conf/event_conf.h
index 964a18a077eb52cc7b34f134df93e30a32df0ab6..177307b7209c77b5f1d0acfbebe06a645caa0118 100644 (file)
--- a/ctdb/conf/event_conf.h
+++ b/ctdb/conf/event_conf.h
@@ -20,7 +20,7 @@
 #ifndef __CTDB_EVENT_CONF_H__
 #define __CTDB_EVENT_CONF_H__
 
-#include "common/conf.h"
+#include "conf/conf.h"
 
 #define EVENT_CONF_SECTION             "event"
 

diff --git a/ctdb/conf/failover_conf.c b/ctdb/conf/failover_conf.c
index 90d0a0ab6d96bd182f34e78fe0526e6b3fcb00a2..3f9f749fcae9e08d765535464ade3edec196c409 100644 (file)
--- a/ctdb/conf/failover_conf.c
+++ b/ctdb/conf/failover_conf.c
@@ -21,7 +21,7 @@
 
 #include "lib/util/debug.h"
 
-#include "common/conf.h"
+#include "conf/conf.h"
 
 #include "conf/failover_conf.h"
 

diff --git a/ctdb/conf/failover_conf.h b/ctdb/conf/failover_conf.h
index d154daa3428995a07ee46f43e401a0379a63df38..d7ac0ac507db86d10d86165ba8623c28d1582631 100644 (file)
--- a/ctdb/conf/failover_conf.h
+++ b/ctdb/conf/failover_conf.h
@@ -20,7 +20,7 @@
 #ifndef __CTDB_FAILOVER_CONF_H__
 #define __CTDB_FAILOVER_CONF_H__
 
-#include "common/conf.h"
+#include "conf/conf.h"
 
 #define FAILOVER_CONF_SECTION "failover"
 

diff --git a/ctdb/conf/legacy_conf.c b/ctdb/conf/legacy_conf.c
index 56cc5bce2da737f8afa797e30d78cba2319f6189..f892d78ea5848594dd01abd8ea7af96a025ffd69 100644 (file)
--- a/ctdb/conf/legacy_conf.c
+++ b/ctdb/conf/legacy_conf.c
@@ -21,9 +21,9 @@
 
 #include "lib/util/debug.h"
 
-#include "common/conf.h"
 #include "common/logging.h"
 
+#include "conf/conf.h"
 #include "conf/legacy_conf.h"
 
 #define LEGACY_SCRIPT_LOG_LEVEL_DEFAULT "ERROR"

diff --git a/ctdb/conf/legacy_conf.h b/ctdb/conf/legacy_conf.h
index b6b4b5738f66b027f469b3110a4873b5b9b052b8..99a06efdc1af46362832d04245c48fc4c4c5c1a2 100644 (file)
--- a/ctdb/conf/legacy_conf.h
+++ b/ctdb/conf/legacy_conf.h
@@ -20,7 +20,7 @@
 #ifndef __CTDB_LEGACY_CONF_H__
 #define __CTDB_LEGACY_CONF_H__
 
-#include "common/conf.h"
+#include "conf/conf.h"
 
 #define LEGACY_CONF_SECTION "legacy"
 

diff --git a/ctdb/conf/logging_conf.c b/ctdb/conf/logging_conf.c
index f5071485ca31415f6e2af7131b8cef56d71fddfa..fb1c3735c0e717d8b489f1f40ef2865b80dfca3e 100644 (file)
--- a/ctdb/conf/logging_conf.c
+++ b/ctdb/conf/logging_conf.c
@@ -21,9 +21,9 @@
 
 #include <talloc.h>
 
-#include "common/conf.h"
 #include "common/logging.h"
 
+#include "conf/conf.h"
 #include "conf/logging_conf.h"
 
 #define LOGGING_LOCATION_DEFAULT       "file:" LOGDIR "/log.ctdb"

diff --git a/ctdb/conf/logging_conf.h b/ctdb/conf/logging_conf.h
index fab478df2f68956c8c0737f58ecf1441b6121556..8f8d1062d4894ef439f30897c426496ba2f6bd69 100644 (file)
--- a/ctdb/conf/logging_conf.h
+++ b/ctdb/conf/logging_conf.h
@@ -20,7 +20,7 @@
 #ifndef __LOGGING_CONF_H__
 #define __LOGGING_CONF_H__
 
-#include "common/conf.h"
+#include "conf/conf.h"
 
 #define LOGGING_CONF_SECTION   "logging"
 

diff --git a/ctdb/event/event_config.c b/ctdb/event/event_config.c
index 81c475c68ca2d73816884fa2720f228c066b1613..8617ebaad30dc2b7de5d79d21de8602e5ce964b8 100644 (file)
--- a/ctdb/event/event_config.c
+++ b/ctdb/event/event_config.c
@@ -21,9 +21,9 @@
 
 #include <talloc.h>
 
-#include "common/conf.h"
 #include "common/path.h"
 
+#include "conf/conf.h"
 #include "conf/logging_conf.h"
 #include "conf/event_conf.h"
 

diff --git a/ctdb/tests/src/conf_test.c b/ctdb/tests/src/conf_test.c
index 9b3bd8f0cc1757b84edea0274be59fd45a6a9918..a38a51bf37e28a32142862533993e714d4b30165 100644 (file)
--- a/ctdb/tests/src/conf_test.c
+++ b/ctdb/tests/src/conf_test.c
@@ -21,7 +21,7 @@
 
 #include <assert.h>
 
-#include "common/conf.c"
+#include "conf/conf.c"
 
 static void test1(void)
 {

diff --git a/ctdb/wscript b/ctdb/wscript
index 0122ecb294ea38ee47d128113a14df9f7851f8e9..a557d0a872eb5b4cc47a49477f45fa5205ea0c96 100644 (file)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -437,7 +437,6 @@ def build(bld):
                         source=bld.SUBDIR('common',
                                           '''cmdline.c
                                              comm.c
-                                             conf.c
                                              db_hash.c
                                              event_script.c
                                              hash_count.c
@@ -531,7 +530,8 @@ def build(bld):
                      install_path='${CTDB_HELPER_BINDIR}')
 
     bld.SAMBA_SUBSYSTEM('ctdb-conf',
-                        source='''conf/logging_conf.c
+                        source='''conf/conf.c
+                                  conf/logging_conf.c
                                   conf/cluster_conf.c
                                   conf/database_conf.c
                                   conf/event_conf.c