Commit 6011ef0f authored by Automatic Updater's avatar Automatic Updater
Browse files

update copyright notice

parent ce249202
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: radix.c,v 1.16 2008/09/12 06:02:31 each Exp $ */ /* $Id: radix.c,v 1.17 2008/09/12 23:47:25 tbox Exp $ */
/* /*
* This source was adapted from MRT's RCS Ids: * This source was adapted from MRT's RCS Ids:
...@@ -417,49 +417,49 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, ...@@ -417,49 +417,49 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target,
if (differ_bit == bitlen && node->bit == bitlen) { if (differ_bit == bitlen && node->bit == bitlen) {
if (node->prefix != NULL) { if (node->prefix != NULL) {
/* Set node_num only if it hasn't been set before */ /* Set node_num only if it hasn't been set before */
if (source != NULL) { if (source != NULL) {
/* Merging node */ /* Merging node */
if (node->node_num[0] == -1 && if (node->node_num[0] == -1 &&
source->node_num[0] != -1) { source->node_num[0] != -1) {
node->node_num[0] = node->node_num[0] =
radix->num_added_node + radix->num_added_node +
source->node_num[0]; source->node_num[0];
node->data[0] = source->data[0]; node->data[0] = source->data[0];
} }
if (node->node_num[1] == -1 && if (node->node_num[1] == -1 &&
source->node_num[0] != -1) { source->node_num[0] != -1) {
node->node_num[1] = node->node_num[1] =
radix->num_added_node + radix->num_added_node +
source->node_num[1]; source->node_num[1];
node->data[1] = source->data[1]; node->data[1] = source->data[1];
} }
} else { } else {
if (node->node_num[ISC_IS6(family)] == -1) if (node->node_num[ISC_IS6(family)] == -1)
node->node_num[ISC_IS6(family)] = node->node_num[ISC_IS6(family)] =
++radix->num_added_node; ++radix->num_added_node;
} }
*target = node; *target = node;
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} else { } else {
result = result =
_ref_prefix(radix->mctx, &node->prefix, prefix); _ref_prefix(radix->mctx, &node->prefix, prefix);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
return (result); return (result);
} }
INSIST(node->data[0] == NULL && node->node_num[0] == -1 && INSIST(node->data[0] == NULL && node->node_num[0] == -1 &&
node->data[1] == NULL && node->node_num[1] == -1); node->data[1] == NULL && node->node_num[1] == -1);
if (source != NULL) { if (source != NULL) {
/* Merging node */ /* Merging node */
if (source->node_num[0] != -1) { if (source->node_num[0] != -1) {
node->node_num[0] = radix->num_added_node + node->node_num[0] = radix->num_added_node +
source->node_num[0]; source->node_num[0];
node->data[0] = source->data[0]; node->data[0] = source->data[0];
} }
if (source->node_num[1] != -1) { if (source->node_num[1] != -1) {
node->node_num[1] = radix->num_added_node + node->node_num[1] = radix->num_added_node +
source->node_num[1]; source->node_num[1];
node->data[1] = source->data[1]; node->data[1] = source->data[1];
} }
} else { } else {
node->node_num[ISC_IS6(family)] = node->node_num[ISC_IS6(family)] =
++radix->num_added_node; ++radix->num_added_node;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment