From 16263015cb711e64baccdf642836641d67b46f9f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 13 Jun 2023 11:23:15 +0200 Subject: [PATCH] core: reorder return in find_master() It feels ugly to set the out arguments, in case we are failing the function. Note that there is no change in behavior here. This is purely cosmetic. (cherry picked from commit 6d75b7f348e6fc62287e1f7f90650cbf094c05f3) --- src/core/nm-manager.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index 4c6f7eaf75..55fca5ae27 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -4516,6 +4516,14 @@ find_master(NMManager *self, nm_device_get_iface(master_device)); } + if (!master_device && !master_connection) { + g_set_error_literal(error, + NM_MANAGER_ERROR, + NM_MANAGER_ERROR_UNKNOWN_DEVICE, + "Master connection not found or invalid"); + return FALSE; + } + NM_SET_OUT(out_master_connection, master_connection); NM_SET_OUT(out_master_device, master_device); if (out_master_ac && master_connection) { @@ -4527,14 +4535,6 @@ find_master(NMManager *self, NULL); } - if (!master_device && !master_connection) { - g_set_error_literal(error, - NM_MANAGER_ERROR, - NM_MANAGER_ERROR_UNKNOWN_DEVICE, - "Master connection not found or invalid"); - return FALSE; - } - return TRUE; }