Changes in uspace/lib/bithenge/src/compound.c [b7fd2a0:6cd10ac] in mainline

File:

• uspace/lib/bithenge/src/compound.c (modified) (10 diffs)

uspace/lib/bithenge/src/compound.c

@@ -62 +62 @@
 }
 
-static errno_t compose_apply(bithenge_transform_t *base, bithenge_scope_t *scope,
+static int compose_apply(bithenge_transform_t *base, bithenge_scope_t *scope,
     bithenge_node_t *in, bithenge_node_t **out)
 {
-        errno_t rc;
+        int rc;
         compose_transform_t *self = transform_as_compose(base);
         bithenge_node_inc_ref(in);
@@ -81 +81 @@
 
         *out = in;
-        return EOK;
-}
-
-static errno_t compose_prefix_length(bithenge_transform_t *base,
+        return rc;
+}
+
+static int compose_prefix_length(bithenge_transform_t *base,
     bithenge_scope_t *scope, bithenge_blob_t *blob, aoff64_t *out)
 {
@@ -115 +115 @@
  * @param num The number of transforms.
  * @return EOK on success or an error code from errno.h. */
-errno_t bithenge_new_composed_transform(bithenge_transform_t **out,
+int bithenge_new_composed_transform(bithenge_transform_t **out,
     bithenge_transform_t **xforms, size_t num)
 {
@@ -126 +126 @@
         }
 
-        errno_t rc;
+        int rc;
         compose_transform_t *self = malloc(sizeof(*self));
         if (!self) {
@@ -168 +168 @@
 }
 
-static errno_t if_transform_choose(if_transform_t *self, bithenge_scope_t *scope,
+static int if_transform_choose(if_transform_t *self, bithenge_scope_t *scope,
     bool *out)
 {
         bithenge_node_t *cond_node;
-        errno_t rc = bithenge_expression_evaluate(self->expr, scope, &cond_node);
+        int rc = bithenge_expression_evaluate(self->expr, scope, &cond_node);
         if (rc != EOK)
                 return rc;
@@ -184 +184 @@
 }
 
-static errno_t if_transform_apply(bithenge_transform_t *base,
+static int if_transform_apply(bithenge_transform_t *base,
     bithenge_scope_t *scope, bithenge_node_t *in, bithenge_node_t **out)
 {
         if_transform_t *self = transform_as_if(base);
         bool cond;
-        errno_t rc = if_transform_choose(self, scope, &cond);
+        int rc = if_transform_choose(self, scope, &cond);
         if (rc != EOK)
                 return rc;
@@ -196 +196 @@
 }
 
-static errno_t if_transform_prefix_length(bithenge_transform_t *base,
+static int if_transform_prefix_length(bithenge_transform_t *base,
     bithenge_scope_t *scope, bithenge_blob_t *in, aoff64_t *out)
 {
         if_transform_t *self = transform_as_if(base);
         bool cond;
-        errno_t rc = if_transform_choose(self, scope, &cond);
+        int rc = if_transform_choose(self, scope, &cond);
         if (rc != EOK)
                 return rc;
@@ -231 +231 @@
  * @param false_xform The transform to apply if the expression is false.
  * @return EOK on success or an error code from errno.h. */
-errno_t bithenge_if_transform(bithenge_transform_t **out,
+int bithenge_if_transform(bithenge_transform_t **out,
     bithenge_expression_t *expr, bithenge_transform_t *true_xform,
     bithenge_transform_t *false_xform)
 {
-        errno_t rc;
+        int rc;
         if_transform_t *self = malloc(sizeof(*self));
         if (!self) {
@@ -282 +282 @@
 }
 
-static errno_t partial_transform_apply(bithenge_transform_t *base,
+static int partial_transform_apply(bithenge_transform_t *base,
     bithenge_scope_t *scope, bithenge_node_t *in, bithenge_node_t **out)
 {
@@ -309 +309 @@
  * @param xform The subtransform to apply.
  * @return EOK on success or an error code from errno.h. */
-errno_t bithenge_partial_transform(bithenge_transform_t **out,
+int bithenge_partial_transform(bithenge_transform_t **out,
     bithenge_transform_t *xform)
 {
-        errno_t rc;
+        int rc;
         partial_transform_t *self = malloc(sizeof(*self));
         if (!self) {