Changeset 2988aec7 in mainline for uspace/app/bithenge/transform.c

Timestamp:

2012-08-14T03:17:17Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

71b0d4d4

Parents:

1b6b76d

Message:

Bithenge: read FAT files/subdirs; self-recursion and more operators

File:

• uspace/app/bithenge/transform.c (modified) (2 diffs)

uspace/app/bithenge/transform.c

@@ -477 +477 @@
 };
 
+/** Set the subtransform of a barrier transform. This must be done before the
+ * barrier transform is used. Takes a reference to @a transform.
+ * @param base The barrier transform.
+ * @param transform The subtransform to use for all operations.
+ * @return EOK on success or an error code from errno.h. */
+int bithenge_barrier_transform_set_subtransform(bithenge_transform_t *base,
+    bithenge_transform_t *transform)
+{
+        assert(transform);
+        assert(bithenge_transform_num_params(transform) == 0);
+
+        barrier_transform_t *self = transform_as_barrier(base);
+        assert(!self->transform);
+        self->transform = transform;
+        return EOK;
+}
+
 /** Create a wrapper transform that creates a new scope. This ensures nothing
  * from the outer scope is passed in, other than parameters. The wrapper may
- * have a different value for num_params. Takes a reference to @a transform,
- * which it will use for all operations.
+ * have a different value for num_params. The subtransform must be set with @a
+ * bithenge_barrier_transform_set_subtransform before the result is used.
  * @param[out] out Holds the created transform.
- * @param transform The transform to wrap.
  * @param num_params The number of parameters to require, which may be 0.
  * @return EOK on success or an error code from errno.h. */
-int bithenge_new_barrier_transform(bithenge_transform_t **out,
-    bithenge_transform_t *transform, int num_params)
-{
-        assert(transform);
-        assert(bithenge_transform_num_params(transform) == 0);
-
+int bithenge_new_barrier_transform(bithenge_transform_t **out, int num_params)
+{
         int rc;
         barrier_transform_t *self = malloc(sizeof(*self));
@@ -501 +513 @@
         if (rc != EOK)
                 goto error;
-        self->transform = transform;
+        self->transform = NULL;
         *out = barrier_as_transform(self);
         return EOK;
 error:
-        bithenge_transform_dec_ref(transform);
         free(self);
         return rc;