Changeset 5e718d9 in mainline for uspace/lib/bithenge/blob.c

Timestamp:

2012-08-21T10:04:16Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

67edca6

Parents:

0da6c04 (diff), 6a97f2e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with upstream (lp:~wtachi/helenos/bithenge)

File:

• uspace/lib/bithenge/blob.c (moved) (moved from uspace/app/bithenge/blob.c ) (7 diffs)

uspace/lib/bithenge/blob.c

@@ -58 +58 @@
         assert(ops->size);
 
+        if (bithenge_should_fail())
+                return ENOMEM;
+
         blob->base.type = BITHENGE_NODE_BLOB;
         blob->base.refs = 1;
@@ -195 +198 @@
 {
         memory_blob_t *blob = blob_as_memory(base);
+        if (bithenge_should_fail())
+                return EIO;
         *size = blob->size;
         return EOK;
@@ -223 +228 @@
         .destroy = memory_destroy,
 };
-
-/** Create a blob node from data. Unlike with @a
- * bithenge_blob_t::bithenge_new_blob_from_buffer, the data is copied into a
- * new buffer and the original data can be changed after this call. The blob
- * must be freed with @a bithenge_node_t::bithenge_node_destroy after it is
- * used.
- * @memberof bithenge_blob_t
- * @param[out] out Stores the created blob node.
- * @param[in] data The data.
- * @param len The length of the data.
- * @return EOK on success or an error code from errno.h. */
-int bithenge_new_blob_from_data(bithenge_node_t **out, const void *data,
-    size_t len)
-{
-        int rc;
-        assert(data || !len);
-
-        memory_blob_t *blob = malloc(sizeof(*blob));
-        if (!blob)
-                return ENOMEM;
-        rc = bithenge_init_random_access_blob(memory_as_blob(blob),
-            &memory_ops);
-        if (rc != EOK) {
-                free(blob);
-                return rc;
-        }
-        char *buffer = malloc(len);
-        if (!buffer) {
-                free(blob);
-                return rc;
-        }
-        memcpy(buffer, data, len);
-        blob->buffer = buffer;
-        blob->size = len;
-        blob->needs_free = true;
-        *out = bithenge_blob_as_node(memory_as_blob(blob));
-        return EOK;
-}
 
 /** Create a blob node from a buffer. The buffer must exist as long as the blob
@@ -280 +247 @@
 
         memory_blob_t *blob = malloc(sizeof(*blob));
-        if (!blob)
-                return ENOMEM;
+        if (!blob) {
+                rc = ENOMEM;
+                goto error;
+        }
         rc = bithenge_init_random_access_blob(memory_as_blob(blob),
             &memory_ops);
-        if (rc != EOK) {
-                free(blob);
-                return rc;
-        }
+        if (rc != EOK)
+                goto error;
         blob->buffer = buffer;
         blob->size = len;
@@ -293 +260 @@
         *out = bithenge_blob_as_node(memory_as_blob(blob));
         return EOK;
-}
+        
+error:
+        if (needs_free)
+                free((void *)buffer);
+        free(blob);
+        return rc;
+}
+
+/** Create a blob node from data. Unlike with @a
+ * bithenge_blob_t::bithenge_new_blob_from_buffer, the data is copied into a
+ * new buffer and the original data can be changed after this call. The blob
+ * must be freed with @a bithenge_node_t::bithenge_node_destroy after it is
+ * used.
+ * @memberof bithenge_blob_t
+ * @param[out] out Stores the created blob node.
+ * @param[in] data The data.
+ * @param len The length of the data.
+ * @return EOK on success or an error code from errno.h. */
+int bithenge_new_blob_from_data(bithenge_node_t **out, const void *data,
+    size_t len)
+{
+        char *buffer = malloc(len);
+        if (!buffer)
+                return ENOMEM;
+        memcpy(buffer, data, len);
+
+        return bithenge_new_blob_from_buffer(out, buffer, len, true);
+}
+
+
 
 typedef struct {
@@ -461 +457 @@
 /** Check whether the contents of two blobs are equal.
  * @memberof bithenge_blob_t
+ * @param[out] out Holds whether the blobs are equal.
  * @param a, b Blobs to compare.
- * @return Whether the blobs are equal. If an error occurs, returns false.
- */
-bool bithenge_blob_equal(bithenge_blob_t *a, bithenge_blob_t *b)
+ * @return EOK on success, or an error code from errno.h.
+ */
+int bithenge_blob_equal(bool *out, bithenge_blob_t *a, bithenge_blob_t *b)
 {
         assert(a);
@@ -476 +473 @@
                 rc = bithenge_blob_read(a, offset, buffer_a, &size_a);
                 if (rc != EOK)
-                        return false;
+                        return rc;
                 rc = bithenge_blob_read(b, offset, buffer_b, &size_b);
                 if (rc != EOK)
-                        return false;
-                if (size_a != size_b || bcmp(buffer_a, buffer_b, size_a))
-                        return false;
+                        return rc;
+                if (size_a != size_b || bcmp(buffer_a, buffer_b, size_a)) {
+                        *out = false;
+                        return EOK;
+                }
                 offset += size_a;
         } while (size_a == sizeof(buffer_a));
-        return true;
+        *out = true;
+        return EOK;
 }