Changeset 286286c in mainline

Timestamp:

2011-09-23T15:56:23Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1ab4aca, 6fe0bf8d

Parents:

4979403

Message:

Cstyle fixes and cleanup.

Location:

uspace

Files:

• app/bdsh/cmds/modules/mount/mount.c (modified) (1 diff)
• lib/c/generic/vfs/vfs.c (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (2 diffs)
• srv/vfs/vfs_register.c (modified) (2 diffs)

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -107 +107 @@
         if (rc != EOK) {
                 printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n",
-                        t_argv[1], t_argv[2], t_argv[3], rc);
+                    t_argv[1], t_argv[2], t_argv[3], rc);
                 return CMD_FAILURE;
         }

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

@@ -182 +182 @@
         sysarg_t rc_orig;
         aid_t req = async_send_3(exch, VFS_IN_MOUNT, service_id, flags,
-                        instance, NULL);
+            instance, NULL);
         sysarg_t rc = async_data_write_start(exch, (void *) mpa, mpa_size);
         if (rc != EOK) {

uspace/srv/vfs/vfs_ops.c

@@ -146 +146 @@
 
                         rindex = (fs_index_t) IPC_GET_ARG1(answer);
-                        rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
+                        rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
+                            IPC_GET_ARG3(answer));
                         rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
                         
@@ -280 +281 @@
         unsigned int instance = IPC_GET_ARG3(*request);
 
-        /*
-         * For now, don't make use of ARG3, but it can be used to
-         * carry mount options in the future.
-         */
-        
         /* We want the client to send us the mount point. */
         char *mp;

uspace/srv/vfs/vfs_register.c

@@ -155 +155 @@
          */
         if (fs_name_to_handle(fs_info->vfs_info.instance,
-                        fs_info->vfs_info.name, false)) {
+            fs_info->vfs_info.name, false)) {
                 /*
                  * We already register a fs like this.
@@ -308 +308 @@
                 fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
                 if (str_cmp(fs->vfs_info.name, name) == 0 &&
-                                instance == fs->vfs_info.instance) {
+                    instance == fs->vfs_info.instance) {
                         handle = fs->fs_handle;
                         break;