Changeset 04a7435f in mainline for uspace/app/bithenge/tree.c

Timestamp:

2012-06-26T19:56:26Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

978ccaf1

Parents:

f2da0bb

Message:

Bithenge: add the struct transform

File:

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

uspace/app/bithenge/tree.c

@@ -105 +105 @@
         simple_internal_node_t *node = node_as_simple(base);
         for (bithenge_int_t i = 0; i < node->len; i++) {
+                bithenge_node_inc_ref(node->nodes[2*i+0]);
+                bithenge_node_inc_ref(node->nodes[2*i+1]);
                 rc = func(node->nodes[2*i+0], node->nodes[2*i+1], data);
                 if (rc != EOK)
@@ -132 +134 @@
 };
 
+/** Initialize an internal node.
+ * @memberof bithenge_node_t
+ * @param[out] node The node.
+ * @param[in] ops The operations provided.
+ * @return EOK on success or an error code from errno.h. */
+int bithenge_init_internal_node(bithenge_node_t *node,
+    const bithenge_internal_node_ops_t *ops)
+{
+        node->type = BITHENGE_NODE_INTERNAL;
+        node->refs = 1;
+        node->internal_ops = ops;
+        return EOK;
+}
+
 /** Create an internal node from a set of keys and values. This function takes
  * ownership of a reference to the key and value nodes, and optionally the
@@ -146 +162 @@
     bithenge_node_t **nodes, bithenge_int_t len, bool needs_free)
 {
+        int rc;
         assert(out);
         simple_internal_node_t *node = malloc(sizeof(*node));
         if (!node) {
-                for (bithenge_int_t i = 0; i < 2 * len; i++)
-                        bithenge_node_dec_ref(nodes[i]);
-                if (needs_free)
-                        free(nodes);
-                return ENOMEM;
-        }
-        node->base.type = BITHENGE_NODE_INTERNAL;
-        node->base.refs = 1;
-        node->base.internal_ops = &simple_internal_node_ops;
+                rc = ENOMEM;
+                goto error;
+        }
+        rc = bithenge_init_internal_node(simple_as_node(node),
+            &simple_internal_node_ops);
+        if (rc != EOK)
+                goto error;
         node->nodes = nodes;
         node->len = len;
@@ -163 +178 @@
         *out = simple_as_node(node);
         return EOK;
+error:
+        for (bithenge_int_t i = 0; i < 2 * len; i++)
+                bithenge_node_dec_ref(nodes[i]);
+        if (needs_free)
+                free(nodes);
+        free(node);
+        return rc;
 }
 
@@ -201 +223 @@
 /** Create a string node.
  * @memberof bithenge_node_t
- * @param[out] out Stores the created string node.
+ * @param[out] out Stores the created string node. On error, this is unchanged.
  * @param value The value for the node to hold.
  * @param needs_free Whether the string should be freed when the node is