From cf25243421c9941cb8caabe22a99ceee7422d1f0 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 19 Aug 2019 12:17:20 +1000 Subject: [PATCH] ctdb-conf: Move conf.[ch] to conf/ subdirectory Signed-off-by: Martin Schwenke Reviewed-by: Guenther Deschner Reviewed-by: Anoop C S --- ctdb/conf/cluster_conf.c | 2 +- ctdb/conf/cluster_conf.h | 2 +- ctdb/{common => conf}/conf.c | 2 +- ctdb/{common => conf}/conf.h | 0 ctdb/conf/conf_tool.c | 2 +- ctdb/conf/ctdb_config.c | 2 +- ctdb/conf/ctdb_config.h | 2 +- ctdb/conf/database_conf.c | 2 +- ctdb/conf/database_conf.h | 2 +- ctdb/conf/event_conf.c | 2 +- ctdb/conf/event_conf.h | 2 +- ctdb/conf/failover_conf.c | 2 +- ctdb/conf/failover_conf.h | 2 +- ctdb/conf/legacy_conf.c | 2 +- ctdb/conf/legacy_conf.h | 2 +- ctdb/conf/logging_conf.c | 2 +- ctdb/conf/logging_conf.h | 2 +- ctdb/event/event_config.c | 2 +- ctdb/tests/src/conf_test.c | 2 +- ctdb/wscript | 4 ++-- 20 files changed, 20 insertions(+), 20 deletions(-) rename ctdb/{common => conf}/conf.c (99%) rename ctdb/{common => conf}/conf.h (100%) diff --git a/ctdb/conf/cluster_conf.c b/ctdb/conf/cluster_conf.c index a5cebf46ea0..b49a2440026 100644 --- 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 38c378fd571..9775b6fc080 100644 --- 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 a8ff724e73f..67046c715e2 100644 --- 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 797d9c77630..28f6c1090d0 100644 --- 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 a97dfd59284..1e7fa72fa59 100644 --- 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 7ccda7d5d53..99f676c5ccc 100644 --- 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 78510e0f2cd..2d0d705ed4a 100644 --- 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 6fa579c1502..e8baffd578d 100644 --- 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 8bb2c1dab49..6b2aeb76c28 100644 --- 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 964a18a077e..177307b7209 100644 --- 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 90d0a0ab6d9..3f9f749fcae 100644 --- 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 d154daa3428..d7ac0ac507d 100644 --- 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 56cc5bce2da..f892d78ea58 100644 --- 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 b6b4b5738f6..99a06efdc1a 100644 --- 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 f5071485ca3..fb1c3735c0e 100644 --- a/ctdb/conf/logging_conf.c +++ b/ctdb/conf/logging_conf.c @@ -21,9 +21,9 @@ #include -#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 fab478df2f6..8f8d1062d48 100644 --- 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 81c475c68ca..8617ebaad30 100644 --- a/ctdb/event/event_config.c +++ b/ctdb/event/event_config.c @@ -21,9 +21,9 @@ #include -#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 9b3bd8f0cc1..a38a51bf37e 100644 --- a/ctdb/tests/src/conf_test.c +++ b/ctdb/tests/src/conf_test.c @@ -21,7 +21,7 @@ #include -#include "common/conf.c" +#include "conf/conf.c" static void test1(void) { diff --git a/ctdb/wscript b/ctdb/wscript index 0122ecb294e..a557d0a872e 100644 --- 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 -- 2.47.2