From cc5a0f517eaa01070f3ed29c19de752224eda7b7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 16 Jun 2021 12:38:52 +0200 Subject: [PATCH] glib-aux: cleanup nm_utils_named_value_clear_with_g_free() implementation (cherry picked from commit 42ba464380808b392ac9245389b417357c91b253) --- src/libnm-glib-aux/nm-shared-utils.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libnm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c index ff1b705006..936d900618 100644 --- a/src/libnm-glib-aux/nm-shared-utils.c +++ b/src/libnm-glib-aux/nm-shared-utils.c @@ -3244,11 +3244,8 @@ void nm_utils_named_value_clear_with_g_free(NMUtilsNamedValue *val) { if (val) { - gs_free gpointer x_name = NULL; - gs_free gpointer x_value = NULL; - - x_name = (gpointer) g_steal_pointer(&val->name); - x_value = g_steal_pointer(&val->value_ptr); + nm_clear_g_free(&val->name_mutable); + nm_clear_g_free(&val->value_ptr); } }