From 3b782ece71a2b1595680159a9cc451f95403267b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 17 Oct 2018 13:18:28 +0200 Subject: [PATCH] cli: minor cleanup of _set_fcn_gobject_enum() No need to check again the gtype_class. We did it above already. (cherry picked from commit 085105fc0e2c51796f4e5c389f1e08b1a783ef70) --- clients/common/nm-meta-setting-desc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index d6f9cd6a3a..d291732a5a 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -1341,12 +1341,13 @@ _set_fcn_gobject_enum (ARGS_SET_FCN) g_value_set_int (&gval, v); else if (gtype_prop == G_TYPE_UINT) g_value_set_uint (&gval, v); - else if (G_IS_ENUM_CLASS (gtype_class)) - g_value_set_enum (&gval, v); - else if (G_IS_FLAGS_CLASS (gtype_class)) + else if (is_flags) { + nm_assert (G_IS_FLAGS_CLASS (gtype_class)); g_value_set_flags (&gval, v); - else - g_return_val_if_reached (FALSE); + } else { + nm_assert (G_IS_ENUM_CLASS (gtype_class)); + g_value_set_enum (&gval, v); + } if (!nm_g_object_set_property (G_OBJECT (setting), property_info->property_name, &gval, NULL)) goto fail;