fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 14:30:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

trivial: rename nm_utils_uuid_generate_from_strings() to _nm_utils_uuid_generate_from_strings()

Browse source 
(cherry picked from commit 67510e323a)
This commit is contained in:
Thomas Haller 2015-02-22 20:15:40 +01:00
parent 0bc93e62f7
commit e0777a33b6
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/NetworkManagerUtils.c
View file

@ -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;

2
src/NetworkManagerUtils.h
View file

@ -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);

14
src/settings/plugins/ibft/reader.c
View file

@ -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,

2
src/settings/plugins/keyfile/reader.c
View file

@ -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);
}

4
src/tests/test-general.c
View file

@ -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 ();