diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-10-17 13:18:28 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-10-17 16:22:34 +0200 |
| commit | 085105fc0e2c51796f4e5c389f1e08b1a783ef70 (patch) | |
| tree | 51490b894c0e7002fa5bb53962d8db1cf9948a80 | |
| parent | 127ac25ef8ddd08a78a4fa8b17df35c528b7a48c (diff) | |
| download | NetworkManager-085105fc0e2c51796f4e5c389f1e08b1a783ef70.tar.gz | |
cli: minor cleanup of _set_fcn_gobject_enum()
No need to check again the gtype_class. We did it above already.
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 9048e927a6..f8d3516d4a 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; |