libnm: add keyfile utility functions

1 files changed, 2 insertions, 35 deletions

diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c
index 28d659f985..f9eb574b0c 100644
--- a/libnm-core/tests/test-keyfile.c
+++ b/libnm-core/tests/test-keyfile.c
@@ -81,39 +81,6 @@ _keyfile_load_from_data (const char *str)
 	return keyfile;
 }
 
-static gboolean
-_keyfile_a_contains_all_in_b (GKeyFile *kf_a, GKeyFile *kf_b)
-{
-	gs_strfreev char **groups = NULL;
-	guint i, j;
-
-	if (kf_a == kf_b)
-		return TRUE;
-
-	groups = g_key_file_get_groups (kf_a, NULL);
-	for (i = 0; groups && groups[i]; i++) {
-		gs_strfreev char **keys = NULL;
-
-		keys = g_key_file_get_keys (kf_a, groups[i], NULL, NULL);
-		if (keys) {
-			for (j = 0; keys[j]; j++) {
-				gs_free char *key_a = g_key_file_get_value (kf_a, groups[i], keys[j], NULL);
-				gs_free char *key_b = g_key_file_get_value (kf_b, groups[i], keys[j], NULL);
-
-				if (g_strcmp0 (key_a, key_b) != 0)
-					return FALSE;
-			}
-		}
-	}
-	return TRUE;
-}
-
-static gboolean
-_keyfile_equals (GKeyFile *kf_a, GKeyFile *kf_b)
-{
-	return _keyfile_a_contains_all_in_b (kf_a, kf_b) && _keyfile_a_contains_all_in_b (kf_b, kf_a);
-}
-
 static GKeyFile *
 _nm_keyfile_write (NMConnection *connection,
                    NMKeyfileWriteHandler handler,
@@ -185,7 +152,7 @@ _keyfile_convert (NMConnection **con,
 		c0_k1_c2 = _nm_keyfile_read (c0_k1, keyfile_name, base_dir, read_handler, read_data, FALSE);
 		c0_k1_c2_k3 = _nm_keyfile_write (c0_k1_c2, write_handler, write_data);
 
-		_keyfile_equals (c0_k1, c0_k1_c2_k3);
+		_nm_keyfile_equals (c0_k1, c0_k1_c2_k3);
 	}
 	if (k0) {
 		NMSetting8021x *s1, *s2;
@@ -247,7 +214,7 @@ _keyfile_convert (NMConnection **con,
 	else {
 		/* finally, if both a keyfile and a connection are given, assert that they are equal
 		 * after a round of conversion. */
-		_keyfile_equals (c0_k1, k0_c1_k2);
+		_nm_keyfile_equals (c0_k1, k0_c1_k2);
 		nmtst_assert_connection_equals (k0_c1, FALSE, c0_k1_c2, FALSE);
 	}
 }