Changeset 61042de in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2017-03-18T20:58:08Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

61600e7

Parents:

b7f69f2

Message:

Cstyle and clutter removal

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (22 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -73 +73 @@
         fibril_mutex_lock(&root_mutex); 
         int r;
-        if (root_fd < 0) {
+        if (root_fd < 0)
                 r = ENOENT;
-        } else {
+        else
                 r = vfs_clone(root_fd, true);
-        }
         fibril_mutex_unlock(&root_mutex);
         return r;
@@ -85 +84 @@
 {
         fibril_mutex_lock(&root_mutex);
-        if (root_fd >= 0) {
+        if (root_fd >= 0)
                 close(root_fd);
-        }
         root_fd = vfs_clone(nroot, true);
         fibril_mutex_unlock(&root_mutex);
@@ -101 +99 @@
         fibril_mutex_lock(&vfs_mutex);
         
-        while (vfs_sess == NULL)
+        while (vfs_sess == NULL) {
                 vfs_sess = service_connect_blocking(SERVICE_VFS, INTERFACE_VFS,
                     0);
+        }
         
         fibril_mutex_unlock(&vfs_mutex);
@@ -132 +131 @@
         async_wait_for(req, &rc_orig);
 
-        if (rc_orig != EOK) {
+        if (rc_orig != EOK)
                 return (int) rc_orig;
-        }
                 
-        if (rc != EOK) {
+        if (rc != EOK)
                 return (int) rc;
-        }
         
         return (int) IPC_GET_ARG1(answer);
@@ -147 +144 @@
         size_t size;
         char *p = vfs_absolutize(path, &size);
-        if (!p) {
+        if (!p)
                 return ENOMEM;
-        }
         int root = vfs_root();
         if (root < 0) {
@@ -221 +217 @@
 
 int vfs_mount(int mp, const char *fs_name, service_id_t serv, const char *opts,
-unsigned int flags, unsigned int instance, int *mountedfd)
+    unsigned int flags, unsigned int instance, int *mountedfd)
 {
         sysarg_t rc, rc1;
         
-        if (!mountedfd) {
+        if (!mountedfd)
                 flags |= VFS_MOUNT_NO_REF;
-        }
-        if (mp < 0) {
+        if (mp < 0)
                 flags |= VFS_MOUNT_CONNECT_ONLY;
-        }
         
         ipc_call_t answer;
         async_exch_t *exch = vfs_exchange_begin();
-        aid_t req = async_send_4(exch, VFS_IN_MOUNT, mp, serv, flags, instance, &answer);
+        aid_t req = async_send_4(exch, VFS_IN_MOUNT, mp, serv, flags, instance,
+            &answer);
 
         rc1 = async_data_write_start(exch, (void *) opts, str_size(opts));
         
         if (rc1 == EOK) {
-                rc1 = async_data_write_start(exch, (void *) fs_name, str_size(fs_name));
+                rc1 = async_data_write_start(exch, (void *) fs_name,
+                    str_size(fs_name));
         }
 
@@ -246 +242 @@
         async_wait_for(req, &rc);
 
-        if (mountedfd) {
+        if (mountedfd)
                 *mountedfd = (int) IPC_GET_ARG1(answer);
-        }
-        
-        if (rc != EOK) {
+        
+        if (rc != EOK)
                 return rc;
-        }
         return rc1;
 }
@@ -271 +265 @@
         
         if (str_cmp(fqsn, "") == 0) {
-                /* No device specified, create a fresh
-                   null/%d device instead */
+                /*
+                 * No device specified, create a fresh null/%d device instead.
+                */
                 null_id = loc_null_create();
                 
@@ -282 +277 @@
         }
         
-        if (flags & IPC_FLAG_BLOCKING) {
+        if (flags & IPC_FLAG_BLOCKING)
                 flags = VFS_MOUNT_BLOCKING;
-        } else {
+        else
                 flags = 0;
-        }
         
         service_id_t service_id;
@@ -315 +309 @@
                 if (root_fd >= 0) {
                         fibril_mutex_unlock(&root_mutex);
-                        if (null_id != -1) {
+                        if (null_id != -1)
                                 loc_null_destroy(null_id);
-                        }
                         return EBUSY;
                 }
                 
                 int root;
-                rc = vfs_mount(-1, fs_name, service_id, opts, flags, instance, &root);
-                if (rc == EOK) {
+                rc = vfs_mount(-1, fs_name, service_id, opts, flags, instance,
+                    &root);
+                if (rc == EOK)
                         root_fd = root;
-                }
         } else {
                 if (root_fd < 0) {
                         fibril_mutex_unlock(&root_mutex);
-                        if (null_id != -1) {
+                        if (null_id != -1)
                                 loc_null_destroy(null_id);
-                        }
                         return EINVAL;
                 }
@@ -337 +329 @@
                 int mpfd = _vfs_walk(root_fd, mpa, WALK_DIRECTORY);
                 if (mpfd >= 0) {
-                        rc = vfs_mount(mpfd, fs_name, service_id, opts, flags, instance, NULL);
+                        rc = vfs_mount(mpfd, fs_name, service_id, opts, flags,
+                            instance, NULL);
                         close(mpfd);
                 } else {
@@ -355 +348 @@
 {
         int mp = vfs_lookup(mpp, WALK_MOUNT_POINT | WALK_DIRECTORY);
-        if (mp < 0) {
+        if (mp < 0)
                 return mp;
-        }
         
         int rc = vfs_unmount(mp);
@@ -368 +360 @@
         int flags = 0;
         if (oflags & O_CREAT) {
-                if (oflags & O_EXCL) {
+                if (oflags & O_EXCL)
                         flags |= WALK_MUST_CREATE;
-                } else {
+                else
                         flags |= WALK_MAY_CREATE;
-                }
         }
         return flags;
@@ -403 +394 @@
         
         int mode =
-                ((oflag & O_RDWR) ? MODE_READ|MODE_WRITE : 0) |
-                ((oflag & O_RDONLY) ? MODE_READ : 0) |
-                ((oflag & O_WRONLY) ? MODE_WRITE : 0) |
-                ((oflag & O_APPEND) ? MODE_APPEND : 0);
+            ((oflag & O_RDWR) ? MODE_READ | MODE_WRITE : 0) |
+            ((oflag & O_RDONLY) ? MODE_READ : 0) |
+            ((oflag & O_WRONLY) ? MODE_WRITE : 0) |
+            ((oflag & O_APPEND) ? MODE_APPEND : 0);
         
         int rc = _vfs_open(fd, mode); 
@@ -476 +467 @@
         vfs_exchange_end(exch);
         
-        if (rc == EOK) {
+        if (rc == EOK)
                 async_wait_for(req, &rc);
-        } else {
+        else
                 async_forget(req);
-        }
         
         if (rc != EOK)
@@ -518 +508 @@
         vfs_exchange_end(exch);
         
-        if (rc == EOK) {
+        if (rc == EOK)
                 async_wait_for(req, &rc);
-        } else {
+        else
                 async_forget(req);
-        }
 
         if (rc != EOK)
@@ -850 +839 @@
         async_wait_for(req, &rc_orig);
         
-        if (rc_orig != EOK) {
+        if (rc_orig != EOK)
                 return (int) rc_orig;
-        }
         return rc;
 }
@@ -911 +899 @@
         
         int rc = _vfs_unlink2(root, pa, -1, WALK_DIRECTORY);
-
         if (rc != EOK) {
                 errno = rc;
@@ -1037 +1024 @@
         fibril_mutex_lock(&cwd_mutex);
         
-        if (cwd_fd >= 0) {
+        if (cwd_fd >= 0)
                 close(cwd_fd);
-        }
-        
-        if (cwd_path) {
+        
+        if (cwd_path)
                 free(cwd_path);
-        }
         
         cwd_fd = fd;
@@ -1248 +1233 @@
 int vfs_pass_handle(async_exch_t *vfs_exch, int file, async_exch_t *exch)
 {
-        return async_state_change_start(exch, VFS_PASS_HANDLE, (sysarg_t)file, 0, vfs_exch);
+        return async_state_change_start(exch, VFS_PASS_HANDLE, (sysarg_t) file,
+            0, vfs_exch);
 }
 
@@ -1264 +1250 @@
 
         sysarg_t ret;
-        sysarg_t rc = async_req_1_1(vfs_exch, VFS_IN_WAIT_HANDLE, high_descriptor, &ret);
+        sysarg_t rc = async_req_1_1(vfs_exch, VFS_IN_WAIT_HANDLE,
+            high_descriptor, &ret);
 
         async_exchange_end(vfs_exch);
 
-        if (rc != EOK) {
+        if (rc != EOK)
                 return rc;
-        }
         return ret;
 }
@@ -1277 +1263 @@
 {
         async_exch_t *vfs_exch = vfs_exchange_begin();
-        int rc = async_req_2_0(vfs_exch, VFS_IN_CLONE, (sysarg_t) file, (sysarg_t) high_descriptor);
+        int rc = async_req_2_0(vfs_exch, VFS_IN_CLONE, (sysarg_t) file,
+            (sysarg_t) high_descriptor);
         vfs_exchange_end(vfs_exch);
         return rc;