From 1f08b01714c9b2cbf476c8cea41290469c6ac4ad Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 15 Feb 2018 11:25:04 +0100 Subject: [PATCH] platform: cleanup nm_platform_link_get_address() to return-early Avoid nested if-blocks, and instead check conditions and return early. --- src/platform/nm-platform.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 572f1c48fd..2c12359cfc 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -1340,30 +1340,26 @@ gconstpointer nm_platform_link_get_address (NMPlatform *self, int ifindex, size_t *length) { const NMPlatformLink *pllink; - gconstpointer a = NULL; - guint8 l = 0; _CHECK_SELF (self, klass, NULL); - if (length) - *length = 0; - g_return_val_if_fail (ifindex > 0, NULL); pllink = nm_platform_link_get (self, ifindex); - if (pllink && pllink->addr.len > 0) { - if (pllink->addr.len > NM_UTILS_HWADDR_LEN_MAX) { - if (length) - *length = 0; - g_return_val_if_reached (NULL); - } - a = pllink->addr.data; - l = pllink->addr.len; + + if ( !pllink + || pllink->addr.len <= 0) { + NM_SET_OUT (length, 0); + return NULL; } - if (length) - *length = l; - return a; + if (pllink->addr.len > NM_UTILS_HWADDR_LEN_MAX) { + NM_SET_OUT (length, 0); + g_return_val_if_reached (NULL); + } + + NM_SET_OUT (length, pllink->addr.len); + return pllink->addr.data; } /**