From 7442a8296ca27345b6b115150ecbb2ee73f2e0f2 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 21 Nov 2022 07:53:23 +0100 Subject: [PATCH] core/team: avoid g_return_val_if_reached() when if_fail() is appropriate This is nicer. --- src/core/devices/team/nm-device-team.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c index e2b1983ecb..415a00b597 100644 --- a/src/core/devices/team/nm-device-team.c +++ b/src/core/devices/team/nm-device-team.c @@ -663,8 +663,7 @@ teamd_start(NMDeviceTeam *self) connection = nm_device_get_applied_connection(NM_DEVICE(self)); s_team = nm_connection_get_setting_team(connection); - if (!s_team) - g_return_val_if_reached(FALSE); + g_return_val_if_fail(s_team, FALSE); nm_assert(iface); @@ -782,8 +781,7 @@ act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason) } s_team = nm_device_get_applied_setting(device, NM_TYPE_SETTING_TEAM); - if (!s_team) - g_return_val_if_reached(NM_ACT_STAGE_RETURN_FAILURE); + g_return_val_if_fail(s_team, FALSE); if (priv->stage1_state == NM_DEVICE_STAGE_STATE_PENDING) return NM_ACT_STAGE_RETURN_POSTPONE;