Changeset 978ccaf1 in mainline for uspace/app/bithenge/tree.h

Timestamp:

2012-06-27T03:35:43Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

600f5d1

Parents:

04a7435f

Message:

Bithenge: various cleanup and tweaks

File:

• uspace/app/bithenge/tree.h (modified) (2 diffs)

uspace/app/bithenge/tree.h

@@ -93 +93 @@
 typedef struct bithenge_internal_node_ops_t {
         /** @copydoc bithenge_node_t::bithenge_node_for_each */
-        int (*for_each)(bithenge_node_t *node, bithenge_for_each_func_t func, void *data);
-        /** @copydoc bithenge_node_t::bithenge_node_destroy */
-        int (*destroy)(bithenge_node_t *node);
+        int (*for_each)(bithenge_node_t *self, bithenge_for_each_func_t func, void *data);
+        /** Destroys the internal node.
+         * @param self The node to destroy. */
+        void (*destroy)(bithenge_node_t *self);
 } bithenge_internal_node_ops_t;
 
@@ -109 +110 @@
 /** Increment a node's reference count.
  * @memberof bithenge_node_t
- * @param node The node to reference.
- * @return EOK on success or an error code from errno.h. */
-static inline int bithenge_node_inc_ref(bithenge_node_t *node)
+ * @param node The node to reference. */
+static inline void bithenge_node_inc_ref(bithenge_node_t *node)
 {
         assert(node);
         node->refs++;
-        return EOK;
 }
 
-int bithenge_node_dec_ref(bithenge_node_t *node);
+void bithenge_node_dec_ref(bithenge_node_t *node);
 
 /** Iterate over a node's children.
  * @memberof bithenge_node_t
- * @param node The internal node to iterate over.
+ * @param self The internal node to iterate over.
  * @param func The callback function.
  * @param data Data to provide to the callback function.
  * @return EOK on success or an error code from errno.h. */
-static inline int bithenge_node_for_each(bithenge_node_t *node, bithenge_for_each_func_t func, void *data)
+static inline int bithenge_node_for_each(bithenge_node_t *self,
+    bithenge_for_each_func_t func, void *data)
 {
-        assert(node->type == BITHENGE_NODE_INTERNAL);
-        return node->internal_ops->for_each(node, func, data);
+        assert(self->type == BITHENGE_NODE_INTERNAL);
+        return self->internal_ops->for_each(self, func, data);
 }
 
 /** Get the value of a boolean node.
  * @memberof bithenge_node_t
- * @param node The boolean node.
+ * @param self The boolean node.
  * @return The node's value. */
-static inline bool bithenge_boolean_node_value(bithenge_node_t *node)
+static inline bool bithenge_boolean_node_value(bithenge_node_t *self)
 {
-        assert(node->type == BITHENGE_NODE_BOOLEAN);
-        return node->boolean_value;
+        assert(self->type == BITHENGE_NODE_BOOLEAN);
+        return self->boolean_value;
 }
 
 /** Get the value of an integer node.
  * @memberof bithenge_node_t
- * @param node The integer node.
+ * @param self The integer node.
  * @return The node's value. */
-static inline bithenge_int_t bithenge_integer_node_value(bithenge_node_t *node)
+static inline bithenge_int_t bithenge_integer_node_value(bithenge_node_t *self)
 {
-        assert(node->type == BITHENGE_NODE_INTEGER);
-        return node->integer_value;
+        assert(self->type == BITHENGE_NODE_INTEGER);
+        return self->integer_value;
 }
 
 /** Get the value of an string node.
  * @memberof bithenge_node_t
- * @param node The string node.
+ * @param self The string node.
  * @return The node's value. */
-static inline const char *bithenge_string_node_value(bithenge_node_t *node)
+static inline const char *bithenge_string_node_value(bithenge_node_t *self)
 {
-        assert(node->type == BITHENGE_NODE_STRING);
-        return node->string_value.ptr;
+        assert(self->type == BITHENGE_NODE_STRING);
+        return self->string_value.ptr;
 }