Changeset 1c79996 in mainline for uspace/lib/bithenge/tree.c

Timestamp:

2012-08-18T23:20:48Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

a42d7d8

Parents:

1f9c9a4

Message:

Bithenge: fix issues and expand coverage for test.sh

File:

• uspace/lib/bithenge/tree.c (modified) (2 diffs)

uspace/lib/bithenge/tree.c

@@ -102 +102 @@
 /** Get a child of a node. Takes ownership of the key. If the node does not
  * provide this function, for_each will be used as an alternative, which may be
- * very slow.
- * @memberof bithenge_node_t
- * @param self The internal node to find a child of.
+ * very slow. Also works for blob nodes to find the byte value at a given
+ * index.
+ * @memberof bithenge_node_t
+ * @param self The internal/blob node to find a child of.
  * @param key The key to search for.
  * @param[out] out Holds the found node.
@@ -112 +113 @@
     bithenge_node_t **out)
 {
+        if (self->type == BITHENGE_NODE_BLOB) {
+                if (bithenge_node_type(key) != BITHENGE_NODE_INTEGER) {
+                        bithenge_node_dec_ref(key);
+                        return ENOENT;
+                }
+                bithenge_int_t offset = bithenge_integer_node_value(key);
+                bithenge_node_dec_ref(key);
+                uint8_t byte;
+                aoff64_t size = 1;
+                int rc = bithenge_blob_read(bithenge_node_as_blob(self),
+                    offset, (char *)&byte, &size);
+                if (rc != EOK)
+                        return rc;
+                if (size != 1)
+                        return ENOENT;
+
+                return bithenge_new_integer_node(out, byte);
+        }
+
         assert(self->type == BITHENGE_NODE_INTERNAL);
         if (self->internal_ops->get)