summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-12-12 10:14:51 +0100
committerThomas Haller <thaller@redhat.com>2018-12-12 12:52:55 +0100
commitd693e03a74bee600ba14ee8dad666ff6fe658ca2 (patch)
tree85bc5e167e8598ac76b40ffdc040c604c16ce69e
parent6ffcd263177d01a528a89709609f06550ecded9b (diff)
downloadNetworkManager-d693e03a74bee600ba14ee8dad666ff6fe658ca2.tar.gz
core/trivial: rename nm_utils_get_boot_id_*()
Rename to nm_utils_boot_id_*(), it matches nm_utils_machine_id_*() and nm_utils_host_id_get().
-rw-r--r--src/devices/nm-device.c2
-rw-r--r--src/nm-core-utils.c6
-rw-r--r--src/nm-core-utils.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index ab30a4dbf3..8f41df8566 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -1295,7 +1295,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);
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index bf009e1d91..22ca7afed1 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -2467,7 +2467,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";
@@ -2773,13 +2773,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;
}
diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
index 4f1a2bad54..dd09f3213b 100644
--- a/src/nm-core-utils.h
+++ b/src/nm-core-utils.h
@@ -275,8 +275,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);