Changeset bad8d41 in mainline for uspace/srv

Timestamp:

2017-12-21T20:24:54Z (8 years ago)

Author:

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

Parents:

f04b5b3

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-21 18:24:59)

git-committer:

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

Message:

The "not-so-obvious" error handling tweaks.

Location:

uspace/srv

Files:

• devman/devtree.c (modified) (1 diff)
• fs/mfs/mfs.c (modified) (2 diffs)
• fs/mfs/mfs_balloc.c (modified) (3 diffs)
• hid/input/ctl/stty.c (modified) (1 diff)
• hid/rfb/rfb.c (modified) (1 diff)
• loader/main.c (modified) (1 diff)
• volsrv/mkfs.c (modified) (1 diff)

uspace/srv/devman/devtree.c

@@ -198 +198 @@
         dev_node_t *rdev = tree->root_node->child;
         dev_add_ref(rdev);
-        int rc = assign_driver(rdev, drivers_list, tree);
+        bool rc = assign_driver(rdev, drivers_list, tree);
         dev_del_ref(rdev);
         

uspace/srv/fs/mfs/mfs.c

@@ -68 +68 @@
                 else {
                         printf(NAME " Unrecognized parameters");
-                        rc = -1;
+                        rc = EINVAL;
                         goto err;
                 }
@@ -78 +78 @@
         if (!vfs_sess) {
                 printf(NAME ": failed to connect to VFS\n");
-                return -1;
+                rc = errno;
+                goto err;
         }
 

uspace/srv/fs/mfs/mfs_balloc.c

@@ -246 +246 @@
                         printf(NAME ": Error! Trying to free beyond the "
                             "bitmap max size\n");
-                        return -1;
+                        return EIO;
                 }
         } else {
@@ -254 +254 @@
                         printf(NAME ": Error! Trying to free beyond the "
                             "bitmap max size\n");
-                        return -1;
+                        return EIO;
                 }
         }
@@ -303 +303 @@
         unsigned *search, i, start_block;
         unsigned bits_per_block;
-        int r, freebit;
+        int r;
+        int freebit;
 
         sbi = inst->sbi;

uspace/srv/hid/input/ctl/stty.c

@@ -243 +243 @@
 
         gsp_init(&sp);
-        return gsp_insert_defs(&sp, seq_defs);
+        if (gsp_insert_defs(&sp, seq_defs) < 0) {
+                return EINVAL;
+        }
+        return EOK;
 }
 

uspace/srv/hid/rfb/rfb.c

@@ -435 +435 @@
 }
 
-static size_t rfb_tile_encode_solid(rfb_t *rfb, cpixel_ctx_t *cpixel,
+static int rfb_tile_encode_solid(rfb_t *rfb, cpixel_ctx_t *cpixel,
     rfb_rectangle_t *tile, void *buf, size_t *size)
 {

uspace/srv/loader/main.c

@@ -300 +300 @@
         pcb.inbox_entries = inbox_entries;
         
-        async_answer_0(rid, rc);
+        async_answer_0(rid, EOK);
         return 0;
 }

uspace/srv/volsrv/mkfs.c

@@ -98 +98 @@
         }
 
-        return retval;
+        return retval == 0 ? EOK : EPARTY;
 }