From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 11 Jul 2018 17:20:33 +0000 (-0400)
Subject: Verb order
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b79237a05cc736d8d7cdc7cfcc40e0ba09fddec8;p=thirdparty%2Ffreeradius-server.git

Verb order
---

diff --git a/src/include/dependency.h b/src/include/dependency.h
index 6b5e4f67aae..85fb8daabd9 100644
--- a/src/include/dependency.h
+++ b/src/include/dependency.h
@@ -36,6 +36,6 @@ char const	*ssl_version_range(uint32_t low, uint32_t high);
 char const	*ssl_version(void);
 int		dependency_feature_add(CONF_SECTION *cs, char const *name, bool enabled);
 int		dependency_version_number_add(CONF_SECTION *cs, char const *name, char const *version);
-void		dependency_init_features(CONF_SECTION *cs);
+void		dependency_features_init(CONF_SECTION *cs);
 void		dependency_version_numbers_init(CONF_SECTION *cs);
 void		dependency_version_print(void);
diff --git a/src/main/dependency.c b/src/main/dependency.c
index 21dab73d1d0..e9b7392e8a7 100644
--- a/src/main/dependency.c
+++ b/src/main/dependency.c
@@ -316,7 +316,7 @@ int dependency_version_number_add(CONF_SECTION *cs, char const *name, char const
  * @param cs Where to add the CONF_PAIRS, if null pairs will be added
  *	to the 'feature' section of the main config.
  */
-void dependency_init_features(CONF_SECTION *cs)
+void dependency_features_init(CONF_SECTION *cs)
 {
 	dependency_feature_add(cs, "accounting",
 #ifdef WITH_ACCOUNTING
@@ -570,7 +570,7 @@ void dependency_version_print(void)
 		int max = 0, len;
 
 		MEM(features = cf_section_alloc(NULL, NULL, "feature", NULL));
-		dependency_init_features(features);
+		dependency_features_init(features);
 
 		MEM(versions = cf_section_alloc(NULL, NULL, "version", NULL));
 		dependency_version_numbers_init(versions);
diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
index c29d72659e9..7affc4daf49 100644
--- a/src/main/mainconfig.c
+++ b/src/main/mainconfig.c
@@ -1014,7 +1014,7 @@ do {\
 			return -1;
 		}
 	}
-	dependency_init_features(subcs);
+	dependency_features_init(subcs);
 
 	/*
 	 *	Add a 'version' subsection off the main config
diff --git a/src/main/unit_test_attribute.c b/src/main/unit_test_attribute.c
index a671cf2fb32..eb0a510296f 100644
--- a/src/main/unit_test_attribute.c
+++ b/src/main/unit_test_attribute.c
@@ -1360,7 +1360,7 @@ int main(int argc, char *argv[])
 	 */
 	MEM(cs = cf_section_alloc(autofree, NULL, "unit_test_attribute", NULL));
 	MEM(features = cf_section_alloc(cs, cs, "feature", NULL));
-	dependency_init_features(features);	/* Add build time features to the config section */
+	dependency_features_init(features);	/* Add build time features to the config section */
 
 	while ((c = getopt(argc, argv, "d:D:fxMh")) != EOF) switch (c) {
 		case 'd':