Changeset 132ab5d1 in mainline for uspace/srv/bd/file_bd/file_bd.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/bd/file_bd/file_bd.c (modified) (8 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -48 +48 @@
 #include <stdint.h>
 #include <errno.h>
+#include <str_error.h>
 #include <stdbool.h>
 #include <task.h>
@@ -134 +135 @@
         rc = loc_service_register(device_name, &service_id);
         if (rc != EOK) {
-                printf("%s: Unable to register device '%s'.\n",
-                    NAME, device_name);
+                printf("%s: Unable to register device '%s': %s.\n",
+                    NAME, device_name, str_error(rc));
                 return rc;
         }
@@ -141 +142 @@
         rc = loc_category_get_id("disk", &disk_cat, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
-                printf("%s: Failed resolving category 'disk'.\n", NAME);
+                printf("%s: Failed resolving category 'disk': %s\n", NAME, str_error(rc));
                 return rc;
         }
@@ -147 +148 @@
         rc = loc_service_add_to_cat(service_id, disk_cat);
         if (rc != EOK) {
-                printf("%s: Failed adding %s to category.",
-                    NAME, device_name);
+                printf("%s: Failed adding %s to category: %s",
+                    NAME, device_name, str_error(rc));
                 return rc;
         }
@@ -221 +222 @@
 {
         size_t n_rd;
-        int rc;
 
         if (size < cnt * block_size)
@@ -237 +237 @@
 
         clearerr(img);
-        rc = fseek(img, ba * block_size, SEEK_SET);
-        if (rc < 0) {
+        if (fseek(img, ba * block_size, SEEK_SET) < 0) {
                 fibril_mutex_unlock(&dev_lock);
                 return EIO;
@@ -263 +262 @@
 {
         size_t n_wr;
-        int rc;
 
         if (size < cnt * block_size)
@@ -279 +277 @@
 
         clearerr(img);
-        rc = fseek(img, ba * block_size, SEEK_SET);
-        if (rc < 0) {
+        if (fseek(img, ba * block_size, SEEK_SET) < 0) {
                 fibril_mutex_unlock(&dev_lock);
                 return EIO;