From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 22 Jun 2023 19:59:31 +0000 (-0400)
Subject: ue explicit invalid name for unused heap IDs
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=159b97c8b129d048516fde0fb6f931705a604e90;p=thirdparty%2Ffreeradius-server.git

ue explicit invalid name for unused heap IDs
---

diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index 9e0fd1fce4d..adbdc5bf183 100644
--- a/src/lib/io/network.c
+++ b/src/lib/io/network.c
@@ -347,7 +347,7 @@ void fr_network_listen_write(fr_network_t *nr, fr_listen_t *li, uint8_t const *p
 		},
 
 		.channel = {
-			.heap_id = 0,
+			.heap_id = FR_HEAP_INDEX_INVALID,
 		},
 
 		.listen = li,
@@ -500,7 +500,7 @@ static void fr_network_recv_reply(void *ctx, fr_channel_t *ch, fr_channel_data_t
 	/*
 	 *	Ensure that heap insert works.
 	 */
-	cd->channel.heap_id = 0;
+	cd->channel.heap_id = FR_HEAP_INDEX_INVALID;
 	if (fr_heap_insert(&nr->replies, cd) < 0) {
 		fr_message_done(&cd->m);
 		fr_assert(0 == 1);
diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c
index 9cc7976f445..6be3f1f1156 100644
--- a/src/lib/server/cf_file.c
+++ b/src/lib/server/cf_file.c
@@ -1127,7 +1127,7 @@ static int process_include(cf_stack_t *stack, CONF_SECTION *parent, char const *
 
 			MEM(h = talloc_zero(frame->heap, cf_file_heap_t));
 			MEM(h->filename = talloc_typed_strdup(h, stack->buff[1]));
-			h->heap_id = 0;
+			h->heap_id = FR_HEAP_INDEX_INVALID;
 			(void) fr_heap_insert(&frame->heap, h);
 		}
 		closedir(dir);
diff --git a/src/lib/server/request.c b/src/lib/server/request.c
index 15bd556b1e5..19bb0036a4a 100644
--- a/src/lib/server/request.c
+++ b/src/lib/server/request.c
@@ -334,8 +334,8 @@ static int _request_free(request_t *request)
 		 *	if the request is freed out of
 		 *	the free list.
 		 */
-		request->time_order_id = 0;
-		request->runnable_id = 0;
+		request->time_order_id = FR_HEAP_INDEX_INVALID;
+		request->runnable_id = FR_HEAP_INDEX_INVALID;
 #endif
 
 		/*