Changeset d5c1051 in mainline for uspace/srv

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

Files:

• bd/file_bd/file_bd.c (modified) (4 diffs)
• bd/sata_bd/sata_bd.c (modified) (1 diff)
• bd/vbd/disk.c (modified) (1 diff)
• fs/exfat/exfat_directory.c (modified) (4 diffs)
• fs/mfs/mfs_inode.c (modified) (4 diffs)
• fs/mfs/mfs_rw.c (modified) (1 diff)
• hid/input/input.c (modified) (6 diffs)
• logger/logs.c (modified) (2 diffs)
• net/ethip/ethip.c (modified) (1 diff)
• net/tcp/test/rqueue.c (modified) (1 diff)
• ns/clonable.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;

uspace/srv/fs/exfat/exfat_directory.c

@@ -218 +218 @@
         uint16_t wname[EXFAT_FILENAME_LEN + 1];
         exfat_dentry_t *d = NULL;
-        int rc, i;
+        int rc;
+        int i;
         size_t offset = 0;
         aoff64_t start_pos = 0;
@@ -305 +306 @@
     exfat_stream_dentry_t *ds)
 {
-        int rc, i, count;
+        int rc;
+        int i, count;
         exfat_dentry_t *array = NULL, *de;
         aoff64_t pos = di->pos;
@@ -372 +374 @@
         exfat_dentry_t df, ds, *de;
         uint16_t wname[EXFAT_FILENAME_LEN + 1];
-        int rc, i;
+        int rc;
+        int i;
         size_t uctable_chars, j;
         aoff64_t pos;
@@ -473 +476 @@
 int exfat_directory_erase_file(exfat_directory_t *di, aoff64_t pos)
 {
-        int rc, count;
+        int rc;
+        int count;
         exfat_dentry_t *de;
 

uspace/srv/fs/mfs/mfs_inode.c

@@ -83 +83 @@
         struct mfs_sb_info *sbi;
         block_t *b;
-        int i, r;
+        int i;
+        int r;
 
         sbi = instance->sbi;
@@ -142 +143 @@
         struct mfs_sb_info *sbi;
         block_t *b;
-        int i, r;
+        int i;
+        int r;
 
         ino_i = malloc(sizeof(*ino_i));
@@ -224 +226 @@
 mfs_write_inode_raw(struct mfs_node *mnode)
 {
-        int i, r;
+        int i;
+        int r;
         block_t *b;
         struct mfs_ino_info *ino_i = mnode->ino_i;
@@ -270 +273 @@
         struct mfs_sb_info *sbi = mnode->instance->sbi;
         block_t *b;
-        int i, r;
+        int i;
+        int r;
 
         const uint32_t inum = ino_i->index - 1;

uspace/srv/fs/mfs/mfs_rw.c

@@ -244 +244 @@
         struct mfs_sb_info *sbi = inst->sbi;
         struct mfs_ino_info *ino_i = mnode->ino_i;
-        int nr_direct, ptrs_per_block, rblock, r;
+        int nr_direct, ptrs_per_block, rblock;
+        int r;
         int i;
 

uspace/srv/hid/input/input.c

@@ -486 +486 @@
         list_append(&kdev->link, &kbd_devs);
         *kdevp = kdev;
-        return EOK;
+        return 0;
         
 fail:
@@ -523 +523 @@
         list_append(&mdev->link, &mouse_devs);
         *mdevp = mdev;
-        return EOK;
+        return 0;
         
 fail:
@@ -599 +599 @@
         
         *sdevp = sdev;
-        return EOK;
+        return 0;
         
 fail:
@@ -670 +670 @@
                 if (!already_known) {
                         kbd_dev_t *kdev;
-                        if (kbd_add_kbdev(svcs[i], &kdev) == EOK) {
+                        if (kbd_add_kbdev(svcs[i], &kdev) == 0) {
                                 printf("%s: Connected keyboard device '%s'\n",
                                     NAME, kdev->svc_name);
@@ -721 +721 @@
                 if (!already_known) {
                         mouse_dev_t *mdev;
-                        if (mouse_add_mousedev(svcs[i], &mdev) == EOK) {
+                        if (mouse_add_mousedev(svcs[i], &mdev) == 0) {
                                 printf("%s: Connected mouse device '%s'\n",
                                     NAME, mdev->svc_name);
@@ -772 +772 @@
                 if (!already_known) {
                         serial_dev_t *sdev;
-                        if (serial_add_srldev(svcs[i], &sdev) == EOK) {
+                        if (serial_add_srldev(svcs[i], &sdev) == 0) {
                                 printf("%s: Connected serial device '%s'\n",
                                     NAME, sdev->kdev->svc_name);

uspace/srv/logger/logs.c

@@ -57 +57 @@
         if (result == NULL)
                 return ENOMEM;
-        int rc = asprintf(&result->filename, "/log/%s", name);
-        if (rc < 0) {
+        if (asprintf(&result->filename, "/log/%s", name) < 0) {
                 free(result);
                 return ENOMEM;
@@ -91 +90 @@
                         goto error;
         } else {
-                int rc = asprintf(&result->full_name, "%s/%s",
-                    parent->full_name, name);
-                if (rc < 0)
+                if (asprintf(&result->full_name, "%s/%s",
+                    parent->full_name, name) < 0)
                         goto error;
                 result->dest = parent->dest;

uspace/srv/net/ethip/ethip.c

@@ -108 +108 @@
         nic->iplink.arg = nic;
 
-        rc = asprintf(&svc_name, "net/eth%u", ++link_num);
-        if (rc < 0) {
+        if (asprintf(&svc_name, "net/eth%u", ++link_num) < 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory.");
+                rc = ENOMEM;
                 goto error;
         }

uspace/srv/net/tcp/test/rqueue.c

@@ -63 +63 @@
         /* We will be calling functions that perform logging */
         rc = log_init("test-tcp");
-        PCUT_ASSERT_INT_EQUALS(EOK, rc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 }
 

uspace/srv/ns/clonable.c

@@ -130 +130 @@
         int rc = loader_spawn("loader");
         
-        if (rc < 0) {
+        if (rc != EOK) {
                 free(csr);
                 async_answer_0(callid, rc);