Changeset 1b6b76d in mainline for uspace/app/bithenge/transform.c

Timestamp:

2012-08-12T05:10:17Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

2988aec7

Parents:

6be4142

Message:

Bithenge: improve efficiency by making out_size optional in prefix_apply

File:

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

uspace/app/bithenge/transform.c

@@ -143 +143 @@
  * @param[out] out_node Holds the result of applying this transform to the
  * prefix.
- * @param[out] out_size Holds the size of the prefix.
+ * @param[out] out_size Holds the size of the prefix. Can be null, in which
+ * case the size is not determined.
  * @return EOK on success, ENOTSUP if not supported, or another error code from
  * errno.h. */
@@ -158 +159 @@
                 return ENOTSUP;
 
-        int rc = bithenge_transform_prefix_length(self, scope, blob, out_size);
+        aoff64_t size;
+        int rc = bithenge_transform_prefix_length(self, scope, blob, &size);
         if (rc != EOK)
                 return rc;
         bithenge_node_t *prefix_blob;
         bithenge_blob_inc_ref(blob);
-        rc = bithenge_new_subblob(&prefix_blob, blob, 0, *out_size);
+        rc = bithenge_new_subblob(&prefix_blob, blob, 0, size);
         if (rc != EOK)
                 return rc;
         rc = bithenge_transform_apply(self, scope, prefix_blob, out_node);
         bithenge_node_dec_ref(prefix_blob);
+        if (out_size)
+                *out_size = size;
         return rc;
 }
@@ -560 +564 @@
 {
         char buffer;
-        *out_size = 1;
-        int rc = bithenge_blob_read_bits(blob, 0, &buffer, out_size, true);
-        if (rc != EOK)
-                return rc;
-        if (*out_size != 1)
-                return EINVAL;
+        aoff64_t size = 1;
+        int rc = bithenge_blob_read_bits(blob, 0, &buffer, &size, true);
+        if (rc != EOK)
+                return rc;
+        if (size != 1)
+                return EINVAL;
+        if (out_size)
+                *out_size = size;
         return bithenge_new_boolean_node(out_node, (buffer & 1) != 0);
 }
@@ -902 +908 @@
                 return EINVAL;
 
-        *out_size = num_bits;
+        aoff64_t size = num_bits;
         uint8_t buffer[sizeof(bithenge_int_t)];
-        rc = bithenge_blob_read_bits(blob, 0, (char *)buffer, out_size,
+        rc = bithenge_blob_read_bits(blob, 0, (char *)buffer, &size,
             little_endian);
         if (rc != EOK)
                 return rc;
-        if (*out_size != (aoff64_t)num_bits)
-                return EINVAL;
+        if (size != (aoff64_t)num_bits)
+                return EINVAL;
+        if (out_size)
+                *out_size = size;
 
         bithenge_int_t result = 0;