Changeset d5c1051 in mainline for uspace/srv/bd

Timestamp:

2017-12-20T22:25:34Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

39b54fe

Parents:

8610c2c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:22:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:25:34)

Message:

"Obviously harmless" error handling tweaks.

Location:

uspace/srv/bd

Files:

• file_bd/file_bd.c (modified) (4 diffs)
• sata_bd/sata_bd.c (modified) (1 diff)
• vbd/disk.c (modified) (1 diff)

uspace/srv/bd/file_bd/file_bd.c

@@ -222 +222 @@
 {
         size_t n_rd;
-        int rc;
 
         if (size < cnt * block_size)
@@ -238 +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;
@@ -264 +262 @@
 {
         size_t n_wr;
-        int rc;
 
         if (size < cnt * block_size)
@@ -280 +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;

uspace/srv/bd/sata_bd/sata_bd.c

@@ -251 +251 @@
         async_set_fallback_port_handler(sata_bd_connection, NULL);
         rc = loc_server_register(NAME);
-        if (rc < 0) {
+        if (rc != EOK) {
                 printf(NAME ": Unable to register driver: %s.\n", str_error(rc));
                 return rc;

uspace/srv/bd/vbd/disk.c

@@ -1114 +1114 @@
         idx = part->lpart->index;
 
-        rc = asprintf(&name, "%sp%u", part->disk->svc_name, idx);
-        if (rc < 0) {
+        if (asprintf(&name, "%sp%u", part->disk->svc_name, idx) < 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory.");
                 return ENOMEM;