Changeset 0c243b4 in mainline

Timestamp:

2008-11-02T10:32:42Z (16 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.

Location:

uspace

Files:

• lib/libblock/libblock.c (modified) (6 diffs)
• lib/libblock/libblock.h (modified) (1 diff)
• srv/fs/tmpfs/tmpfs_dump.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);

uspace/lib/libblock/libblock.h

@@ -77 +77 @@
 extern void block_put(block_t *);
 
-extern bool block_read(int, off_t *, size_t *, off_t *, void *, size_t, size_t);
+extern int block_read(int, off_t *, size_t *, off_t *, void *, size_t, size_t);
 
 #endif

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -66 +66 @@
                 uint32_t size;
                 
-                if (!block_read(dev, bufpos, buflen, pos, &entry, sizeof(entry),
-                    TMPFS_BLOCK_SIZE))
+                if (block_read(dev, bufpos, buflen, pos, &entry, sizeof(entry),
+                    TMPFS_BLOCK_SIZE) != EOK)
                         return false;
                 
@@ -86 +86 @@
                         }
                         
-                        if (!block_read(dev, bufpos, buflen, pos, fname,
-                            entry.len, TMPFS_BLOCK_SIZE)) {
+                        if (block_read(dev, bufpos, buflen, pos, fname,
+                            entry.len, TMPFS_BLOCK_SIZE) != EOK) {
                                 ops->destroy((void *) node);
                                 free(fname);
@@ -101 +101 @@
                         free(fname);
                         
-                        if (!block_read(dev, bufpos, buflen, pos, &size,
-                            sizeof(size), TMPFS_BLOCK_SIZE))
+                        if (block_read(dev, bufpos, buflen, pos, &size,
+                            sizeof(size), TMPFS_BLOCK_SIZE) != EOK)
                                 return false;
                         
@@ -112 +112 @@
                         
                         node->size = size;
-                        if (!block_read(dev, bufpos, buflen, pos, node->data,
-                            size, TMPFS_BLOCK_SIZE))
+                        if (block_read(dev, bufpos, buflen, pos, node->data,
+                            size, TMPFS_BLOCK_SIZE) != EOK)
                                 return false;
                         
@@ -128 +128 @@
                         }
                         
-                        if (!block_read(dev, bufpos, buflen, pos,
-                            fname, entry.len, TMPFS_BLOCK_SIZE)) {
+                        if (block_read(dev, bufpos, buflen, pos, fname,
+                            entry.len, TMPFS_BLOCK_SIZE) != EOK) {
                                 ops->destroy((void *) node);
                                 free(fname);
@@ -170 +170 @@
         
         char tag[6];
-        if (!block_read(dev, &bufpos, &buflen, &pos, tag, 5,
-            TMPFS_BLOCK_SIZE))
+        if (block_read(dev, &bufpos, &buflen, &pos, tag, 5,
+            TMPFS_BLOCK_SIZE) != EOK)
                 goto error;