 @@ -1,14 +1,14 @@
-/*	$NetBSD: radixtree.c,v 1.21 2020/01/12 20:00:41 para Exp $	*/
+/*	$NetBSD: radixtree.c,v 1.22 2020/01/28 16:33:34 ad Exp $	*/
 /*-
  * Copyright (c)2011,2012,2013 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -102,37 +102,37 @@
  * leaf nodes with the given tag.  To reduce amount of nodes to visit for
  * these functions, this implementation keeps tagging information in internal
  * intermediate nodes and quickly skips uninterested parts of a tree.
+ *
  * A tree has RADIX_TREE_TAG_ID_MAX independent tag spaces, each of which are
  * identified by an zero-origin numbers, tagid.  For the current implementation,
  * RADIX_TREE_TAG_ID_MAX is 2.  A set of tags is described as a bitmask tagmask,
  * which is a bitwise OR of (1 << tagid).
  */
 #include <sys/cdefs.h>
 #if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, "$NetBSD: radixtree.c,v 1.21 2020/01/12 20:00:41 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radixtree.c,v 1.22 2020/01/28 16:33:34 ad Exp $");
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/pool.h>
 #include <sys/radixtree.h>
 #include <lib/libkern/libkern.h>
 #if defined(_STANDALONE)
 #include <lib/libsa/stand.h>
 #endif /* defined(_STANDALONE) */
 #else /* defined(_KERNEL) || defined(_STANDALONE) */
-__RCSID("$NetBSD: radixtree.c,v 1.21 2020/01/12 20:00:41 para Exp $");
+__RCSID("$NetBSD: radixtree.c,v 1.22 2020/01/28 16:33:34 ad Exp $");
 #include <assert.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #if 1
 #define KASSERT assert
 #else
 #define KASSERT(a)	/* nothing */
 #endif
 #endif /* defined(_KERNEL) || defined(_STANDALONE) */
 #include <sys/radixtree.h>
 @@ -339,26 +339,43 @@ radix_tree_node_ctor(void *dummy, void *
+ *
  * initialize the subsystem.
  */
 void
 radix_tree_init(void)
+{
 	radix_tree_node_cache = pool_cache_init(sizeof(struct radix_tree_node),
 	    coherency_unit, 0, PR_LARGECACHE, "radixnode", NULL, IPL_NONE,
 	    radix_tree_node_ctor, NULL, NULL);
 	KASSERT(radix_tree_node_cache != NULL);
+}
 /*
  * radix_tree_await_memory:
+ *
  * after an insert has failed with ENOMEM, wait for memory to become
  * available, so the caller can retry.
  */
 void
 radix_tree_await_memory(void)
+{
 	struct radix_tree_node *n;
 	n = pool_cache_get(radix_tree_node_cache, PR_WAITOK);
 	pool_cache_put(radix_tree_node_cache, n);
+}
 #endif /* defined(_KERNEL) */
 static bool __unused
 radix_tree_node_clean_p(const struct radix_tree_node *n)
+{
 #if RADIX_TREE_PTR_PER_NODE > 16
 	unsigned int i;
 	for (i = 0; i < RADIX_TREE_PTR_PER_NODE; i++) {
 		if (n->n_ptrs[i] != NULL) {
 			return false;
+		}
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: radixtree.h,v 1.6 2019/12/05 18:32:25 ad Exp $	*/
+/*	$NetBSD: radixtree.h,v 1.7 2020/01/28 16:33:34 ad Exp $	*/
 /*-
  * Copyright (c)2011 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -37,26 +37,27 @@ struct radix_tree {
 #if defined(_KERNEL) || defined(_STANDALONE)
 #include <sys/types.h>
 #else /* defined(_KERNEL) || defined(_STANDALONE) */
 #include <stdbool.h>
 #include <stdint.h>
 #endif /* defined(_KERNEL) || defined(_STANDALONE) */
 /*
  * subsystem
  */
 #if defined(_KERNEL)
 void radix_tree_init(void);
 void radix_tree_await_memory(void);
 #endif /* defined(_KERNEL) */
 /*
  * tree
  */
 void radix_tree_init_tree(struct radix_tree *);
 void radix_tree_fini_tree(struct radix_tree *);
 bool radix_tree_empty_tree_p(struct radix_tree *);
 /*
  * node
  */