From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 21 Feb 2023 02:22:18 +0000 (-0500)
Subject: I wish compilers would give consistent error messages
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d0e6e09d807ddd91110969bd2ce6e8829943f4d;p=thirdparty%2Ffreeradius-server.git

I wish compilers would give consistent error messages
---

diff --git a/src/lib/util/dict_tokenize.c b/src/lib/util/dict_tokenize.c
index d982a69dd0c..65eb7b7ec18 100644
--- a/src/lib/util/dict_tokenize.c
+++ b/src/lib/util/dict_tokenize.c
@@ -2420,7 +2420,7 @@ static int _dict_from_file(dict_tokenize_ctx_t *ctx,
 			 *	Pop the stack until we get to a PROTOCOL nesting.
 			 */
 			while ((ctx->stack_depth > 0) && (ctx->stack[ctx->stack_depth].nest != NEST_PROTOCOL)) {
-				if (ctx->stack[ctx->stack_depth].nest != FR_TYPE_NULL) {
+				if (ctx->stack[ctx->stack_depth].nest != NEST_NONE) {
 					fr_strerror_printf_push("END-PROTOCOL %s with mismatched BEGIN-??? %s", argv[1],
 						ctx->stack[ctx->stack_depth].da->name);
 					goto error;
@@ -2511,7 +2511,7 @@ static int _dict_from_file(dict_tokenize_ctx_t *ctx,
 			 *	Pop the stack until we get to a TLV nesting.
 			 */
 			while ((ctx->stack_depth > 0) && (ctx->stack[ctx->stack_depth].nest != NEST_TLV)) {
-				if (ctx->stack[ctx->stack_depth].nest != FR_TYPE_NULL) {
+				if (ctx->stack[ctx->stack_depth].nest != NEST_NONE) {
 					fr_strerror_printf_push("END-TLV %s with mismatched BEGIN-??? %s", argv[1],
 						ctx->stack[ctx->stack_depth].da->name);
 					goto error;
@@ -2680,7 +2680,7 @@ static int _dict_from_file(dict_tokenize_ctx_t *ctx,
 			 *	Pop the stack until we get to a VENDOR nesting.
 			 */
 			while ((ctx->stack_depth > 0) && (ctx->stack[ctx->stack_depth].nest != NEST_VENDOR)) {
-				if (ctx->stack[ctx->stack_depth].nest != FR_TYPE_NULL) {
+				if (ctx->stack[ctx->stack_depth].nest != NEST_NONE) {
 					fr_strerror_printf_push("END-VENDOR %s with mismatched BEGIN-??? %s", argv[1],
 						ctx->stack[ctx->stack_depth].da->name);
 					goto error;