]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
update copyright notice
authorAutomatic Updater <source@isc.org>
Fri, 12 Sep 2008 23:47:25 +0000 (23:47 +0000)
committerAutomatic Updater <source@isc.org>
Fri, 12 Sep 2008 23:47:25 +0000 (23:47 +0000)
lib/isc/radix.c

index 0ebd2daaab572d85d1ecc3766d6a0d36ec254c62..19c0e8c5f304ed8823b5e28e3cbfce357d00bb84 100644 (file)
@@ -14,7 +14,7 @@
  * 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:
@@ -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 (node->prefix != NULL) {
                        /* Set node_num only if it hasn't been set before */
-                        if (source != NULL) {
-                                /* Merging node */
-                                if (node->node_num[0] == -1 &&
-                                    source->node_num[0] != -1) {
-                                        node->node_num[0] =
-                                                radix->num_added_node +
-                                                source->node_num[0];
-                                        node->data[0] = source->data[0];
-                                }
-                                if (node->node_num[1] == -1 &&
-                                    source->node_num[0] != -1) {
-                                        node->node_num[1] =
-                                                radix->num_added_node +
-                                                source->node_num[1];
-                                        node->data[1] = source->data[1];
-                                }
-                        } else {
-                                if (node->node_num[ISC_IS6(family)] == -1)
-                                        node->node_num[ISC_IS6(family)] =
-                                                 ++radix->num_added_node;
-                        }
+                       if (source != NULL) {
+                               /* Merging node */
+                               if (node->node_num[0] == -1 &&
+                                   source->node_num[0] != -1) {
+                                       node->node_num[0] =
+                                               radix->num_added_node +
+                                               source->node_num[0];
+                                       node->data[0] = source->data[0];
+                               }
+                               if (node->node_num[1] == -1 &&
+                                   source->node_num[0] != -1) {
+                                       node->node_num[1] =
+                                               radix->num_added_node +
+                                               source->node_num[1];
+                                       node->data[1] = source->data[1];
+                               }
+                       } else {
+                               if (node->node_num[ISC_IS6(family)] == -1)
+                                       node->node_num[ISC_IS6(family)] =
+                                                ++radix->num_added_node;
+                       }
                        *target = node;
                        return (ISC_R_SUCCESS);
-                } else {
-                        result =
-                                _ref_prefix(radix->mctx, &node->prefix, prefix);
-                        if (result != ISC_R_SUCCESS)
-                                return (result);
-                }
+               } else {
+                       result =
+                               _ref_prefix(radix->mctx, &node->prefix, prefix);
+                       if (result != ISC_R_SUCCESS)
+                               return (result);
+               }
                INSIST(node->data[0] == NULL && node->node_num[0] == -1 &&
                       node->data[1] == NULL && node->node_num[1] == -1);
                if (source != NULL) {
                        /* Merging node */
-                        if (source->node_num[0] != -1) {
-                                node->node_num[0] = radix->num_added_node +
-                                                    source->node_num[0];
-                                node->data[0] = source->data[0];
-                        }
-                        if (source->node_num[1] != -1) {
-                                node->node_num[1] = radix->num_added_node +
-                                                    source->node_num[1];
-                                node->data[1] = source->data[1];
-                        }
+                       if (source->node_num[0] != -1) {
+                               node->node_num[0] = radix->num_added_node +
+                                                   source->node_num[0];
+                               node->data[0] = source->data[0];
+                       }
+                       if (source->node_num[1] != -1) {
+                               node->node_num[1] = radix->num_added_node +
+                                                   source->node_num[1];
+                               node->data[1] = source->data[1];
+                       }
                } else {
                        node->node_num[ISC_IS6(family)] =
                                ++radix->num_added_node;