remove CTL_LEAF_SUBTREE2

It was never really needed, as name conflict can be handled it with
__VA_ARGS__ parameter but now as by_handle handlers are in two separete files we
do not have a conflict at all.

Author: lplewa

src/ctl/ctl_internal.h

@@ -225,13 +225,6 @@ umf_result_t ctl_query(struct ctl *ctl, void *ctx,
             NULL                                                               \
     }
 
-#define CTL_LEAF_SUBTREE2(name, fun, ...)                                      \
-    {                                                                          \
-        CTL_STR(name), CTL_NODE_SUBTREE,                                       \
-            {NULL, NULL, NULL, CTL_SUBTREE_HANDLER(fun, __VA_ARGS__)}, NULL,   \
-            NULL                                                               \
-    }
-
 /*
  * Declaration of a new read-write leaf. If used both read and write function
  * must be declared by CTL_READ_HANDLER and CTL_WRITE_HANDLER macros.

src/memory_pool.c

@@ -37,7 +37,7 @@ static struct ctl umf_pool_ctl_root;
 
 static void ctl_init(void);
 
-static umf_result_t CTL_SUBTREE_HANDLER(by_handle_pool)(
+static umf_result_t CTL_SUBTREE_HANDLER(by_handle)(
     void *ctx, umf_ctl_query_source_t source, void *arg, size_t size,
     umf_ctl_index_utlist_t *indexes, const char *extra_name,
     umf_ctl_query_type_t queryType) {
@@ -121,7 +121,7 @@ static umf_result_t CTL_READ_HANDLER(alloc_count)(
 static const umf_ctl_node_t CTL_NODE(stats)[] = {CTL_LEAF_RO(alloc_count),
                                                  CTL_NODE_END};
 
-umf_ctl_node_t CTL_NODE(pool)[] = {CTL_LEAF_SUBTREE2(by_handle, by_handle_pool),
+umf_ctl_node_t CTL_NODE(pool)[] = {CTL_LEAF_SUBTREE(by_handle),
                                    CTL_LEAF_SUBTREE(default), CTL_NODE_END};
 
 static void ctl_init(void) {

src/memory_provider.c

@@ -21,7 +21,7 @@
 #include "memory_provider_internal.h"
 #include "utils_assert.h"
 
-static umf_result_t CTL_SUBTREE_HANDLER(by_handle_provider)(
+static umf_result_t CTL_SUBTREE_HANDLER(by_handle)(
     void *ctx, umf_ctl_query_source_t source, void *arg, size_t size,
     umf_ctl_index_utlist_t *indexes, const char *extra_name,
     umf_ctl_query_type_t queryType) {
@@ -32,8 +32,8 @@ static umf_result_t CTL_SUBTREE_HANDLER(by_handle_provider)(
     return UMF_RESULT_SUCCESS;
 }
 
-umf_ctl_node_t CTL_NODE(provider)[] = {
-    CTL_LEAF_SUBTREE2(by_handle, by_handle_provider), CTL_NODE_END};
+umf_ctl_node_t CTL_NODE(provider)[] = {CTL_LEAF_SUBTREE(by_handle),
+                                       CTL_NODE_END};
 
 static umf_result_t umfDefaultPurgeLazy(void *provider, void *ptr,
                                         size_t size) {