diff options
author | Thomas Haller <thaller@redhat.com> | 2018-11-01 12:52:38 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-11-13 18:30:03 +0100 |
commit | eb9f950a330212d4780971d269423b0d90c51c5c (patch) | |
tree | f40b0193b16a65207ec5422ea7ba54a7d7a13cfb /src/nm-ip6-config.c | |
parent | 3746845204b77a80dacbd7a0d7272e7ca30d1e3c (diff) | |
download | NetworkManager-eb9f950a330212d4780971d269423b0d90c51c5c.tar.gz |
all: cleanup GChecksum handling
- prefer nm_auto_free_checksum over explicit free.
- use nm_utils_checksum_get_digest*().
- prefer defines for digest length.
- assume g_checksum_new() cannot fail.
Diffstat (limited to 'src/nm-ip6-config.c')
-rw-r--r-- | src/nm-ip6-config.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index a8c4aecdf2..42240e698f 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -2426,29 +2426,19 @@ nm_ip6_config_hash (const NMIP6Config *self, GChecksum *sum, gboolean dns_only) gboolean nm_ip6_config_equal (const NMIP6Config *a, const NMIP6Config *b) { - GChecksum *a_checksum = g_checksum_new (G_CHECKSUM_SHA1); - GChecksum *b_checksum = g_checksum_new (G_CHECKSUM_SHA1); - guchar a_data[20], b_data[20]; - gsize a_len = sizeof (a_data); - gsize b_len = sizeof (b_data); - gboolean equal; + nm_auto_free_checksum GChecksum *a_checksum = g_checksum_new (G_CHECKSUM_SHA1); + nm_auto_free_checksum GChecksum *b_checksum = g_checksum_new (G_CHECKSUM_SHA1); + guint8 a_data[NM_UTILS_CHECKSUM_LENGTH_SHA1]; + guint8 b_data[NM_UTILS_CHECKSUM_LENGTH_SHA1]; if (a) nm_ip6_config_hash (a, a_checksum, FALSE); if (b) nm_ip6_config_hash (b, b_checksum, FALSE); - g_checksum_get_digest (a_checksum, a_data, &a_len); - g_checksum_get_digest (b_checksum, b_data, &b_len); - - nm_assert (a_len == sizeof (a_data)); - nm_assert (b_len == sizeof (b_data)); - equal = !memcmp (a_data, b_data, a_len); - - g_checksum_free (a_checksum); - g_checksum_free (b_checksum); - - return equal; + nm_utils_checksum_get_digest (a_checksum, a_data); + nm_utils_checksum_get_digest (b_checksum, b_data); + return !memcmp (a_data, b_data, sizeof (a_data)); } /*****************************************************************************/ |