Changeset 0c243b4 in mainline for uspace/lib/libblock/libblock.c

Timestamp:

2008-11-02T10:32:42Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f1ba5d6

Parents:

6284978

Message:

block_read() should return the real error code.

File:

• uspace/lib/libblock/libblock.c (modified) (6 diffs)

uspace/lib/libblock/libblock.c

@@ -177 +177 @@
 {
         void *bb_buf;
+        int rc;
 
         devcon_t *devcon = devcon_search(dev_handle);
@@ -189 +190 @@
         off_t bufpos = 0;
         size_t buflen = 0;
-        if (!block_read(dev_handle, &bufpos, &buflen, &off,
-            bb_buf, size, size)) {
+        rc = block_read(dev_handle, &bufpos, &buflen, &off,
+            bb_buf, size, size);
+        if (rc != EOK) {
                 free(bb_buf);
-                return EIO;     /* XXX real error code */
+                return rc;
         }
         devcon->bb_buf = bb_buf;
@@ -220 +222 @@
  * @param block_size    Block size to be used for the transfer.
  *
- * @return              True on success, false on failure.
+ * @return              EOK on success or a negative return code on failure.
  */
-bool
+int
 block_read(int dev_handle, off_t *bufpos, size_t *buflen, off_t *pos, void *dst,
     size_t size, size_t block_size)
@@ -257 +259 @@
                             *pos / block_size, block_size, &retval);
                         if ((rc != EOK) || (retval != EOK))
-                                return false;
+                                return (rc != EOK ? rc : retval);
                         
                         *bufpos = 0;
@@ -264 +266 @@
         }
         
-        return true;
+        return EOK;
 }
 
@@ -286 +288 @@
         b->size = bs;
 
-        if (!block_read(dev_handle, &bufpos, &buflen, &pos, b->data,
-            bs, bs)) {
+        if (block_read(dev_handle, &bufpos, &buflen, &pos, b->data,
+            bs, bs) != EOK) {
                 free(b->data);
                 free(b);