From bb40abb3dee70080ea787a36f5294e223036691a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 4 Apr 2017 13:50:30 +0200
Subject: [PATCH] cli: move nmc_bond_validate_mode() to
 "clients/common/nm-client-utils.h"

"clients/common/nm-client-utils.h" already contains other nmc_* validation functions.
It's the better place for nmc_bond_validate_mode()
---
 clients/common/nm-client-utils.c      | 21 +++++++++++++++++++++
 clients/common/nm-client-utils.h      |  3 +++
 clients/common/nm-meta-setting-desc.c | 21 ---------------------
 clients/common/nm-meta-setting-desc.h |  3 ---
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c
index 2abd3671b7..8f8b51606b 100644
--- a/clients/common/nm-client-utils.c
+++ b/clients/common/nm-client-utils.c
@@ -224,3 +224,24 @@ matches (const char *cmd, const char *pattern)
 	return memcmp (pattern, cmd, len) == 0;
 }
 
+const char *
+nmc_bond_validate_mode (const char *mode, GError **error)
+{
+	unsigned long mode_int;
+	static const char *valid_modes[] = { "balance-rr",
+	                                     "active-backup",
+	                                     "balance-xor",
+	                                     "broadcast",
+	                                     "802.3ad",
+	                                     "balance-tlb",
+	                                     "balance-alb",
+	                                     NULL };
+	if (nmc_string_to_uint (mode, TRUE, 0, 6, &mode_int)) {
+		/* Translate bonding mode numbers to mode names:
+		 * https://www.kernel.org/doc/Documentation/networking/bonding.txt
+		 */
+		return valid_modes[mode_int];
+	} else
+		return nmc_string_is_valid (mode, valid_modes, error);
+}
+
diff --git a/clients/common/nm-client-utils.h b/clients/common/nm-client-utils.h
index 7f700f930f..9ef568991c 100644
--- a/clients/common/nm-client-utils.h
+++ b/clients/common/nm-client-utils.h
@@ -60,4 +60,7 @@ gboolean nmc_string_to_tristate (const char *str, NMCTriStateValue *val, GError
 
 gboolean matches (const char *cmd, const char *pattern);
 
+/* FIXME: don't expose this function on it's own, at least not from this file. */
+const char *nmc_bond_validate_mode (const char *mode, GError **error);
+
 #endif /* __NM_CLIENT_UTILS_H__ */
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 68079056e0..0d602a595d 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -401,27 +401,6 @@ nmc_proxy_check_script (const char *script, char **out_script, GError **error)
 	return TRUE;
 }
 
-const char *
-nmc_bond_validate_mode (const char *mode, GError **error)
-{
-	unsigned long mode_int;
-	static const char *valid_modes[] = { "balance-rr",
-	                                     "active-backup",
-	                                     "balance-xor",
-	                                     "broadcast",
-	                                     "802.3ad",
-	                                     "balance-tlb",
-	                                     "balance-alb",
-	                                     NULL };
-	if (nmc_string_to_uint (mode, TRUE, 0, 6, &mode_int)) {
-		/* Translate bonding mode numbers to mode names:
-		 * https://www.kernel.org/doc/Documentation/networking/bonding.txt
-		 */
-		return valid_modes[mode_int];
-	} else
-		return nmc_string_is_valid (mode, valid_modes, error);
-}
-
 /*
  * nmc_team_check_config:
  * @config: file name with team config, or raw team JSON config data
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
index eb886e2593..352d447a5e 100644
--- a/clients/common/nm-meta-setting-desc.h
+++ b/clients/common/nm-meta-setting-desc.h
@@ -196,7 +196,4 @@ struct _NMMetaEnvironment {
 
 /*****************************************************************************/
 
-/* FIXME: don't expose this function on it's own, at least not from this file. */
-const char *nmc_bond_validate_mode (const char *mode, GError **error);
-
 #endif /* __NM_META_SETTING_DESC_H__ */