summaryrefslogtreecommitdiff
path: root/libnm-util
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-02-06 18:44:31 +0100
committerThomas Haller <thaller@redhat.com>2017-02-06 19:27:21 +0100
commit31c0c66c0e8c23a2428b3d0f5dcf7e32c71d3b92 (patch)
tree2fddaa34c8c22d3ee38b4b5dadef3eb4d479c6ec /libnm-util
parent77140cafe32ed1dc77f57a99c5dbad296af43635 (diff)
downloadNetworkManager-31c0c66c0e8c23a2428b3d0f5dcf7e32c71d3b92.tar.gz
settings: drop redundant range check from NMSettingBridgePort::verify()
priv->path_cost and priv->priority can only be set as GObject properties, which already does the same range check. Hence, the checks are never reached. This also avoids a compiler warning: libnm-core/nm-setting-bridge-port.c: In function ‘verify’: libnm-core/nm-setting-bridge-port.c:132:22: error: comparison is always false due to limited range of data type [-Werror=type-limits] if (priv->path_cost > BR_MAX_PATH_COST) { ^
Diffstat (limited to 'libnm-util')
-rw-r--r--libnm-util/nm-setting-bridge-port.c30
1 files changed, 2 insertions, 28 deletions
diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c
index 3d671ae376..24417059e2 100644
--- a/libnm-util/nm-setting-bridge-port.c
+++ b/libnm-util/nm-setting-bridge-port.c
@@ -145,32 +145,6 @@ nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *setting)
static gboolean
verify (NMSetting *setting, GSList *all_settings, GError **error)
{
- NMSettingBridgePortPrivate *priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
-
- if (priv->priority > BR_MAX_PORT_PRIORITY) {
- g_set_error (error,
- NM_SETTING_BRIDGE_PORT_ERROR,
- NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY,
- _("'%d' is not a valid value for the property (should be <= %d)"),
- priv->priority, BR_MAX_PORT_PRIORITY);
- g_prefix_error (error, "%s.%s: ",
- NM_SETTING_BRIDGE_PORT_SETTING_NAME,
- NM_SETTING_BRIDGE_PORT_PRIORITY);
- return FALSE;
- }
-
- if (priv->path_cost > BR_MAX_PATH_COST) {
- g_set_error (error,
- NM_SETTING_BRIDGE_PORT_ERROR,
- NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY,
- _("'%d' is not a valid value for the property (should be <= %d)"),
- priv->path_cost, BR_MAX_PATH_COST);
- g_prefix_error (error, "%s.%s: ",
- NM_SETTING_BRIDGE_PORT_SETTING_NAME,
- NM_SETTING_BRIDGE_PORT_PATH_COST);
- return FALSE;
- }
-
return TRUE;
}
@@ -204,10 +178,10 @@ set_property (GObject *object, guint prop_id,
switch (prop_id) {
case PROP_PRIORITY:
- priv->priority = (guint16) (g_value_get_uint (value) & 0xFFFF);
+ priv->priority = g_value_get_uint (value);
break;
case PROP_PATH_COST:
- priv->path_cost = (guint16) (g_value_get_uint (value) & 0xFFFF);
+ priv->path_cost = g_value_get_uint (value);
break;
case PROP_HAIRPIN_MODE:
priv->hairpin_mode = g_value_get_boolean (value);