Changeset 3c70376 in mainline for uspace/app/bithenge/transform.c

Timestamp:

2012-08-09T04:57:22Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

c54f5d0

Parents:

0b60d2d

Message:

Bithenge: move compound transforms to separate file; fix warnings

File:

• uspace/app/bithenge/transform.c (modified) (1 diff)

uspace/app/bithenge/transform.c

@@ -948 +948 @@
 bithenge_named_transform_t *bithenge_primitive_transforms = primitive_transforms;
 
-typedef struct {
-        bithenge_transform_t base;
-        bithenge_transform_t **xforms;
-        size_t num;
-} compose_transform_t;
-
-static bithenge_transform_t *compose_as_transform(compose_transform_t *xform)
-{
-        return &xform->base;
-}
-
-static compose_transform_t *transform_as_compose(bithenge_transform_t *xform)
-{
-        return (compose_transform_t *)xform;
-}
-
-static int compose_apply(bithenge_transform_t *base, bithenge_scope_t *scope,
-    bithenge_node_t *in, bithenge_node_t **out)
-{
-        int rc;
-        compose_transform_t *self = transform_as_compose(base);
-        bithenge_node_inc_ref(in);
-
-        /* i ranges from (self->num - 1) to 0 inside the loop. */
-        for (size_t i = self->num; i--; ) {
-                bithenge_node_t *tmp;
-                rc = bithenge_transform_apply(self->xforms[i], scope, in,
-                    &tmp);
-                bithenge_node_dec_ref(in);
-                if (rc != EOK)
-                        return rc;
-                in = tmp;
-        }
-
-        *out = in;
-        return rc;
-}
-
-static int compose_prefix_length(bithenge_transform_t *base,
-    bithenge_scope_t *scope, bithenge_blob_t *blob, aoff64_t *out)
-{
-        compose_transform_t *self = transform_as_compose(base);
-        return bithenge_transform_prefix_length(self->xforms[self->num - 1],
-            scope, blob, out);
-}
-
-static void compose_destroy(bithenge_transform_t *base)
-{
-        compose_transform_t *self = transform_as_compose(base);
-        for (size_t i = 0; i < self->num; i++)
-                bithenge_transform_dec_ref(self->xforms[i]);
-        free(self->xforms);
-        free(self);
-}
-
-static const bithenge_transform_ops_t compose_transform_ops = {
-        .apply = compose_apply,
-        .prefix_length = compose_prefix_length,
-        .destroy = compose_destroy,
-};
-
-/** Create a composition of multiple transforms. When the result is applied to a
- * node, each transform is applied in turn, with the last transform applied
- * first. @a xforms may contain any number of transforms or no transforms at
- * all. This function takes ownership of @a xforms and the references therein.
- * @param[out] out Holds the result.
- * @param[in] xforms The transforms to apply.
- * @param num The number of transforms.
- * @return EOK on success or an error code from errno.h. */
-int bithenge_new_composed_transform(bithenge_transform_t **out,
-    bithenge_transform_t **xforms, size_t num)
-{
-        if (num == 0) {
-                /* TODO: optimize */
-        } else if (num == 1) {
-                *out = xforms[0];
-                free(xforms);
-                return EOK;
-        }
-
-        int rc;
-        compose_transform_t *self = malloc(sizeof(*self));
-        if (!self) {
-                rc = ENOMEM;
-                goto error;
-        }
-        rc = bithenge_init_transform(compose_as_transform(self),
-            &compose_transform_ops, 0);
-        if (rc != EOK)
-                goto error;
-        self->xforms = xforms;
-        self->num = num;
-        *out = compose_as_transform(self);
-        return EOK;
-error:
-        for (size_t i = 0; i < num; i++)
-                bithenge_transform_dec_ref(xforms[i]);
-        free(xforms);
-        free(self);
-        return rc;
-}
-
 /** @}
  */