Changeset 5c925ce in mainline for uspace/app/bithenge/tree.c

Timestamp:

2012-06-07T17:00:12Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8375d0eb

Parents:

5f679702

Message:

Bithenge: make blobs a type of node

File:

• uspace/app/bithenge/tree.c (modified) (3 diffs)

uspace/app/bithenge/tree.c

@@ -37 +37 @@
 #include <errno.h>
 #include <stdlib.h>
+#include "blob.h"
 #include "tree.h"
+
+static int blob_destroy(bithenge_node_t *base)
+{
+        bithenge_blob_t *blob = bithenge_node_as_blob(base);
+        assert(blob->base.blob_ops);
+        return blob->base.blob_ops->destroy(blob);
+}
 
 int bithenge_node_destroy(bithenge_node_t *node)
 {
         switch (bithenge_node_type(node)) {
+        case BITHENGE_NODE_BLOB:
+                return blob_destroy(node);
         case BITHENGE_NODE_STRING:
                 if (node->string_value.needs_free)
@@ -47 +57 @@
                 break;
         case BITHENGE_NODE_INTERNAL:
-                /* TODO */
-                break;
+                return node->internal_ops->destroy(node);
         case BITHENGE_NODE_BOOLEAN:
                 return EOK; // the boolean nodes are allocated statically below
@@ -84 +93 @@
 }
 
+static int simple_internal_node_destroy(bithenge_node_t *base)
+{
+        int rc;
+        simple_internal_node_t *node = node_as_simple(base);
+        for (bithenge_int_t i = 0; i < node->len; i++) {
+                rc = bithenge_node_destroy(node->nodes[2*i+0]);
+                if (rc != EOK)
+                        return rc;
+                rc = bithenge_node_destroy(node->nodes[2*i+1]);
+                if (rc != EOK)
+                        return rc;
+        }
+        if (node->needs_free)
+                free(node->nodes);
+        free(node);
+        return EOK;
+}
+
 static bithenge_internal_node_ops_t simple_internal_node_ops = {
-        .for_each = simple_internal_node_for_each
+        .for_each = simple_internal_node_for_each,
+        .destroy = simple_internal_node_destroy,
 };