diff options
author | Thomas Haller <thaller@redhat.com> | 2015-02-22 20:15:40 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2015-07-03 09:24:00 +0200 |
commit | e0777a33b6f01e449a4c9010980cec94040211a1 (patch) | |
tree | f57b0d1d16b03a930cf988fb4f95c4d288b86c7d | |
parent | 0bc93e62f76b9b6c4064c940aed1e6fd1bfb2a20 (diff) |
trivial: rename nm_utils_uuid_generate_from_strings() to _nm_utils_uuid_generate_from_strings()
(cherry picked from commit 67510e323a69a6724c9f454fa040b993e1d9b7f4)
-rw-r--r-- | src/NetworkManagerUtils.c | 4 | ||||
-rw-r--r-- | src/NetworkManagerUtils.h | 2 | ||||
-rw-r--r-- | src/settings/plugins/ibft/reader.c | 14 | ||||
-rw-r--r-- | src/settings/plugins/keyfile/reader.c | 2 | ||||
-rw-r--r-- | src/tests/test-general.c | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index a870f51751..a4760cbdfd 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -1996,7 +1996,7 @@ nm_utils_cmp_connection_by_autoconnect_priority (NMConnection **a, NMConnection } /** - * nm_utils_uuid_generate_from_strings: + * _nm_utils_uuid_generate_from_strings: * @string1: a variadic list of strings. Must be NULL terminated. * * Returns a variant3 UUID based on the concatenated C strings. @@ -2009,7 +2009,7 @@ nm_utils_cmp_connection_by_autoconnect_priority (NMConnection **a, NMConnection * ("aa"), ("aa", ""), ("", "aa"), ... */ char * -nm_utils_uuid_generate_from_strings (const char *string1, ...) +_nm_utils_uuid_generate_from_strings (const char *string1, ...) { GString *str; va_list args; diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index c1512176fc..8bc3a49350 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -157,7 +157,7 @@ void nm_utils_log_connection_diff (NMConnection *connection, NMConnection *diff_ #define NM_UTILS_UUID_NS "b425e9fb-7598-44b4-9e3b-5a2e3aaa4905" -char *nm_utils_uuid_generate_from_strings (const char *string1, ...) G_GNUC_NULL_TERMINATED; +char *_nm_utils_uuid_generate_from_strings (const char *string1, ...) G_GNUC_NULL_TERMINATED; #define NM_UTILS_NS_PER_SECOND ((gint64) 1000000000) gint64 nm_utils_get_monotonic_timestamp_ns (void); diff --git a/src/settings/plugins/ibft/reader.c b/src/settings/plugins/ibft/reader.c index 9f95123282..9bc6346278 100644 --- a/src/settings/plugins/ibft/reader.c +++ b/src/settings/plugins/ibft/reader.c @@ -397,13 +397,13 @@ connection_setting_add (const GPtrArray *block, prefix ? prefix : "", iface); - uuid = nm_utils_uuid_generate_from_strings ("ibft", - s_hwaddr, - s_vlanid ? "V" : "v", - s_vlanid ? s_vlanid : "", - s_ip4addr ? "A" : "DHCP", - s_ip4addr ? s_ip4addr : "", - NULL); + uuid = _nm_utils_uuid_generate_from_strings ("ibft", + s_hwaddr, + s_vlanid ? "V" : "v", + s_vlanid ? s_vlanid : "", + s_ip4addr ? "A" : "DHCP", + s_ip4addr ? s_ip4addr : "", + NULL); s_con = nm_setting_connection_new (); g_object_set (s_con, diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c index 8f50b4bf4f..97b6567028 100644 --- a/src/settings/plugins/keyfile/reader.c +++ b/src/settings/plugins/keyfile/reader.c @@ -1327,7 +1327,7 @@ nm_keyfile_plugin_connection_from_file (const char *filename, GError **error) if (!nm_setting_connection_get_uuid (s_con)) { char *hashed_uuid; - hashed_uuid = nm_utils_uuid_generate_from_strings ("keyfile", filename, NULL); + hashed_uuid = _nm_utils_uuid_generate_from_strings ("keyfile", filename, NULL); g_object_set (s_con, NM_SETTING_CONNECTION_UUID, hashed_uuid, NULL); g_free (hashed_uuid); } diff --git a/src/tests/test-general.c b/src/tests/test-general.c index e93f351c2f..63ea258a84 100644 --- a/src/tests/test-general.c +++ b/src/tests/test-general.c @@ -622,7 +622,7 @@ __test_uuid (const char *expected_uuid, const char *str, gssize slen, char *uuid g_free (uuid_test); } -#define _test_uuid(expected_uuid, str, strlen, ...) __test_uuid (expected_uuid, str, strlen, nm_utils_uuid_generate_from_strings(__VA_ARGS__, NULL)) +#define _test_uuid(expected_uuid, str, strlen, ...) __test_uuid (expected_uuid, str, strlen, _nm_utils_uuid_generate_from_strings(__VA_ARGS__, NULL)) static void test_nm_utils_uuid_generate_from_strings (void) @@ -778,7 +778,7 @@ main (int argc, char **argv) g_test_add_func ("/general/connection-sort/autoconnect-priority", test_connection_sort_autoconnect_priority); - g_test_add_func ("/general/nm_utils_uuid_generate_from_strings", test_nm_utils_uuid_generate_from_strings); + g_test_add_func ("/general/_nm_utils_uuid_generate_from_strings", test_nm_utils_uuid_generate_from_strings); g_test_add_func ("/general/nm_match_spec_interface_name", test_nm_match_spec_interface_name); return g_test_run (); |