From aafc1dbe4712c86189bbc1d4d54ad8cb4c69be7e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 5 Oct 2020 22:27:18 +0200 Subject: New upstream version 1.27.90 --- libnm-core/nm-setting-vrf.c | 162 +++++++++++++++++++++----------------------- 1 file changed, 79 insertions(+), 83 deletions(-) (limited to 'libnm-core/nm-setting-vrf.c') diff --git a/libnm-core/nm-setting-vrf.c b/libnm-core/nm-setting-vrf.c index 296f4542..71143659 100644 --- a/libnm-core/nm-setting-vrf.c +++ b/libnm-core/nm-setting-vrf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1+ */ #include "nm-default.h" @@ -18,9 +18,7 @@ /*****************************************************************************/ -NM_GOBJECT_PROPERTIES_DEFINE_BASE ( - PROP_TABLE, -); +NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_TABLE, ); /** * NMSettingVrf: @@ -30,15 +28,15 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE ( * Since: 1.24 */ struct _NMSettingVrf { - NMSetting parent; - guint32 table; + NMSetting parent; + guint32 table; }; struct _NMSettingVrfClass { - NMSettingClass parent; + NMSettingClass parent; }; -G_DEFINE_TYPE (NMSettingVrf, nm_setting_vrf, NM_TYPE_SETTING) +G_DEFINE_TYPE(NMSettingVrf, nm_setting_vrf, NM_TYPE_SETTING) /*****************************************************************************/ @@ -51,76 +49,72 @@ G_DEFINE_TYPE (NMSettingVrf, nm_setting_vrf, NM_TYPE_SETTING) * Since: 1.24 **/ guint32 -nm_setting_vrf_get_table (NMSettingVrf *setting) +nm_setting_vrf_get_table(NMSettingVrf *setting) { - g_return_val_if_fail (NM_IS_SETTING_VRF (setting), 0); + g_return_val_if_fail(NM_IS_SETTING_VRF(setting), 0); - return setting->table; + return setting->table; } /*****************************************************************************/ static gboolean -verify (NMSetting *setting, NMConnection *connection, GError **error) +verify(NMSetting *setting, NMConnection *connection, GError **error) { - NMSettingVrf *self = NM_SETTING_VRF (setting); - - if (!_nm_connection_verify_required_interface_name (connection, error)) - return FALSE; - - if (self->table == 0) { - g_set_error_literal (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("table cannot be zero")); - g_prefix_error (error, "%s.%s: ", NM_SETTING_VRF_SETTING_NAME, - NM_SETTING_VRF_TABLE); - return FALSE; - } - - return TRUE; + NMSettingVrf *self = NM_SETTING_VRF(setting); + + if (!_nm_connection_verify_required_interface_name(connection, error)) + return FALSE; + + if (self->table == 0) { + g_set_error_literal(error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("table cannot be zero")); + g_prefix_error(error, "%s.%s: ", NM_SETTING_VRF_SETTING_NAME, NM_SETTING_VRF_TABLE); + return FALSE; + } + + return TRUE; } /*****************************************************************************/ static void -get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) +get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMSettingVrf *self = NM_SETTING_VRF (object); - - switch (prop_id) { - case PROP_TABLE: - g_value_set_uint (value, self->table); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + NMSettingVrf *self = NM_SETTING_VRF(object); + + switch (prop_id) { + case PROP_TABLE: + g_value_set_uint(value, self->table); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } } static void -set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) +set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - NMSettingVrf *self = NM_SETTING_VRF (object); - - switch (prop_id) { - case PROP_TABLE: - self->table = g_value_get_uint (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + NMSettingVrf *self = NM_SETTING_VRF(object); + + switch (prop_id) { + case PROP_TABLE: + self->table = g_value_get_uint(value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } } /*****************************************************************************/ static void -nm_setting_vrf_init (NMSettingVrf *setting) -{ -} +nm_setting_vrf_init(NMSettingVrf *setting) +{} /** * nm_setting_vrf_new: @@ -132,37 +126,39 @@ nm_setting_vrf_init (NMSettingVrf *setting) * Since: 1.24 **/ NMSetting * -nm_setting_vrf_new (void) +nm_setting_vrf_new(void) { - return (NMSetting *) g_object_new (NM_TYPE_SETTING_VRF, NULL); + return (NMSetting *) g_object_new(NM_TYPE_SETTING_VRF, NULL); } static void -nm_setting_vrf_class_init (NMSettingVrfClass *klass) +nm_setting_vrf_class_init(NMSettingVrfClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - NMSettingClass *setting_class = NM_SETTING_CLASS (klass); - - object_class->get_property = get_property; - object_class->set_property = set_property; - - setting_class->verify = verify; - - /** - * NMSettingVrf:table: - * - * The routing table for this VRF. - * - * Since: 1.24 - **/ - obj_properties[PROP_TABLE] = - g_param_spec_uint (NM_SETTING_VRF_TABLE, "", "", - 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | - NM_SETTING_PARAM_INFERRABLE | - G_PARAM_STATIC_STRINGS); - - g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); - - _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_VRF); + GObjectClass * object_class = G_OBJECT_CLASS(klass); + NMSettingClass *setting_class = NM_SETTING_CLASS(klass); + + object_class->get_property = get_property; + object_class->set_property = set_property; + + setting_class->verify = verify; + + /** + * NMSettingVrf:table: + * + * The routing table for this VRF. + * + * Since: 1.24 + **/ + obj_properties[PROP_TABLE] = + g_param_spec_uint(NM_SETTING_VRF_TABLE, + "", + "", + 0, + G_MAXUINT32, + 0, + G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); + + g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); + + _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_VRF); } -- cgit 1.3.0-6-gf8a5