From a44a8c5eee1d3cb93ff87f52640a28004c0a5b3d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 28 Apr 2021 23:25:16 +0200 Subject: [PATCH] cli: fix RETURN_STR_EMPTYUNSET() macro for printing handle_emptyunset string This was currently unused, because actually no property of type string had handle_emptyunuset set. Fixes: e9ee4e39f199 ('cli: handle string properties that can both be empty and %NULL') (cherry picked from commit 2c37a34d530649df4fb0b6dd826df90ee55bd66f) (cherry picked from commit e8de0433c23a866791c14045934e3b2949fd2e3c) --- clients/common/nm-meta-setting-desc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index cdb3084a07..0c71ec641a 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -862,7 +862,7 @@ _get_fcn_gobject_impl(const NMMetaPropertyInfo *property_info, * signal them differently. */ cstr = g_value_get_string(&val); nm_assert((!!is_default) == (cstr == NULL)); - RETURN_STR_EMPTYUNSET(get_type, is_default, NULL); + RETURN_STR_EMPTYUNSET(get_type, is_default, cstr); } }