fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 12:18:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/trivial: rename nm_utils_get_boot_id_*()

Browse source 
Rename to nm_utils_boot_id_*(), it matches nm_utils_machine_id_*()
and nm_utils_host_id_get().

(cherry picked from commit d693e03a74)
This commit is contained in:
Thomas Haller 2018-12-12 10:14:51 +01:00
parent cdb7f6f6d2
commit 4482c4d4af
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/devices/nm-device.c
View file

@ -1289,7 +1289,7 @@ _get_stable_id (NMDevice *self,
stable_type = nm_utils_stable_id_parse (stable_id,
nm_device_get_ip_iface (self),
!hwaddr_is_fake ? hwaddr : NULL,
nm_utils_get_boot_id_str (),
nm_utils_boot_id_str (),
uuid,
&generated);

6
src/nm-core-utils.c
View file

@ -2669,7 +2669,7 @@ again:
* to read/write the secret-key to disk. Fallback to boot-id. The boot-id
* itself may be fake and randomly generated ad-hoc, but that is as best
* as it gets. */
seed_bin = (const guint8 *) nm_utils_get_boot_id_bin ();
seed_bin = (const guint8 *) nm_utils_boot_id_bin ();
seed_len = sizeof (NMUuid);
fake_type = "boot-id";
hash_seed = "7ff0c8f5-5399-4901-ab63-61bf594abe8b";
@ -2975,13 +2975,13 @@ again:
}
const char *
nm_utils_get_boot_id_str (void)
nm_utils_boot_id_str (void)
{
return _boot_id_get ()->str;
}
const NMUuid *
nm_utils_get_boot_id_bin (void)
nm_utils_boot_id_bin (void)
{
return &_boot_id_get ()->bin;
}

4
src/nm-core-utils.h
View file

@ -286,8 +286,8 @@ const char *nm_utils_machine_id_str (void);
const struct _NMUuid *nm_utils_machine_id_bin (void);
gboolean nm_utils_machine_id_is_fake (void);
const char *nm_utils_get_boot_id_str (void);
const struct _NMUuid *nm_utils_get_boot_id_bin (void);
const char *nm_utils_boot_id_str (void);
const struct _NMUuid *nm_utils_boot_id_bin (void);
gboolean nm_utils_host_id_get (const guint8 **out_host_id,
gsize *out_host_id_len);