summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2022-03-21 12:55:05 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2022-10-14 11:29:58 +0200
commit871d17a6f39b272319ac617f7d1c653dee6ac215 (patch)
tree52fa4b417fd97d9997338e6e4ce33dc7868924d0
parent4c89c7df38048275bcb78c52b7fa6468bc43d17d (diff)
downloadNetworkManager-871d17a6f39b272319ac617f7d1c653dee6ac215.tar.gz
dhcp: use nm_g_bytes_equal0() in _set_effective_client_id()
(cherry picked from commit 874403b5889d4bc46981e723fb7f4fc65c7dbf32)
-rw-r--r--src/core/dhcp/nm-dhcp-client.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c
index 85e48ff70b..70f3f4017f 100644
--- a/src/core/dhcp/nm-dhcp-client.c
+++ b/src/core/dhcp/nm-dhcp-client.c
@@ -116,16 +116,13 @@ _set_effective_client_id(NMDhcpClient *self, GBytes *client_id, gboolean take)
nm_assert(!client_id || g_bytes_get_size(client_id) >= 2);
- if (priv->effective_client_id == client_id
- || (priv->effective_client_id && client_id
- && g_bytes_equal(priv->effective_client_id, client_id))) {
+ if (nm_g_bytes_equal0(priv->effective_client_id, client_id)) {
if (take && client_id)
g_bytes_unref(client_id);
return;
}
- if (priv->effective_client_id)
- g_bytes_unref(priv->effective_client_id);
+ g_bytes_unref(priv->effective_client_id);
priv->effective_client_id = client_id;
if (!take && client_id)
g_bytes_ref(client_id);