From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 9 Feb 2022 21:04:46 +0000 (-0500)
Subject: use newer macros, which devolve to array lookups
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50281eebfee74f213ac1efa2c3815e64577c8426;p=thirdparty%2Ffreeradius-server.git

use newer macros, which devolve to array lookups
---

diff --git a/src/lib/util/types.c b/src/lib/util/types.c
index 814c915dbb9..40ad87c4bc4 100644
--- a/src/lib/util/types.c
+++ b/src/lib/util/types.c
@@ -467,24 +467,7 @@ static fr_type_t type_promote_table[FR_TYPE_MAX][FR_TYPE_MAX] = {
  */
 fr_type_t fr_type_promote(fr_type_t a, fr_type_t b)
 {
-	/*
-	 *	Invalid types
-	 */
-	switch (a) {
-	case FR_TYPE_NON_LEAF:
-		return FR_TYPE_NULL;
-
-	default:
-		break;
-	}
-
-	switch (b) {
-	case FR_TYPE_NON_LEAF:
-		return FR_TYPE_NULL;
-
-	default:
-		break;
-	}
+	if (!fr_type_is_leaf(a) || (fr_type_is_leaf(b))) return FR_TYPE_NULL;
 
 	if (a == b) return a;