From 871d17a6f39b272319ac617f7d1c653dee6ac215 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 21 Mar 2022 12:55:05 +0100 Subject: dhcp: use nm_g_bytes_equal0() in _set_effective_client_id() (cherry picked from commit 874403b5889d4bc46981e723fb7f4fc65c7dbf32) --- src/core/dhcp/nm-dhcp-client.c | 7 ++----- 1 file 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); -- cgit v1.2.1