ue explicit invalid name for unused heap IDs

diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index 9e0fd1fce4dc5af3f274487416ede51b9817e744..adbdc5bf183b82532bddebccc266e4a812f60aad 100644 (file)
--- 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 9cc7976f445c46a0f6ff59bb4dc4868380643b0d..6be3f1f1156d9f37de6b4e08b6f43ad43d8144d9 100644 (file)
--- 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 15bd556b1e59aa78111d0b07824084c1b2d4dab3..19bb0036a4a45ba8d1edbfe3c0736cb6249a5ceb 100644 (file)
--- 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
 
                /*