Changeset 77534 in vbox

Timestamp:

Mar 1, 2019 3:12:26 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

129138

Message:

linux/vboxsf: More cleanups. bugref:9172

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (2 diffs)
• mount.vboxsf.c (modified) (1 diff)
• regops.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/sharedfolders/dirops.c ¶

@@ -167 +167 @@
     int d_type;
     switch (fMode & RTFS_TYPE_MASK) {
-    case RTFS_TYPE_FIFO:
-        d_type = DT_FIFO;
-        break;
-    case RTFS_TYPE_DEV_CHAR:
-        d_type = DT_CHR;
-        break;
-    case RTFS_TYPE_DIRECTORY:
-        d_type = DT_DIR;
-        break;
-    case RTFS_TYPE_DEV_BLOCK:
-        d_type = DT_BLK;
-        break;
-    case RTFS_TYPE_FILE:
-        d_type = DT_REG;
-        break;
-    case RTFS_TYPE_SYMLINK:
-        d_type = DT_LNK;
-        break;
-    case RTFS_TYPE_SOCKET:
-        d_type = DT_SOCK;
-        break;
-    case RTFS_TYPE_WHITEOUT:
-        d_type = DT_WHT;
-        break;
-    default:
-        d_type = DT_UNKNOWN;
-        break;
+        case RTFS_TYPE_FIFO:
+            d_type = DT_FIFO;
+            break;
+        case RTFS_TYPE_DEV_CHAR:
+            d_type = DT_CHR;
+            break;
+        case RTFS_TYPE_DIRECTORY:
+            d_type = DT_DIR;
+            break;
+        case RTFS_TYPE_DEV_BLOCK:
+            d_type = DT_BLK;
+            break;
+        case RTFS_TYPE_FILE:
+            d_type = DT_REG;
+            break;
+        case RTFS_TYPE_SYMLINK:
+            d_type = DT_LNK;
+            break;
+        case RTFS_TYPE_SOCKET:
+            d_type = DT_SOCK;
+            break;
+        case RTFS_TYPE_WHITEOUT:
+            d_type = DT_WHT;
+            break;
+        default:
+            d_type = DT_UNKNOWN;
+            break;
     }
     return d_type;
@@ -304 +304 @@
         err = vbsf_getdent(dir, d_name, &d_type);
         switch (err) {
-        case 1:
-            return 0;
-
-        case 0:
-            break;
-
-        case -1:
-        default:
-            /* skip erroneous entry and proceed */
-            LogFunc(("vbsf_getdent error %d\n", err));
-            dir->f_pos += 1;
+            case 1:
+                return 0;
+
+            case 0:
+                break;
+
+            case -1:
+            default:
+                /* skip erroneous entry and proceed */
+                LogFunc(("vbsf_getdent error %d\n", err));
+                dir->f_pos += 1;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-            ctx->pos += 1;
-#endif
-            continue;
+                ctx->pos += 1;
+#endif
+                continue;
         }
 

trunk/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ¶

@@ -206 +206 @@
                 }
 
-                switch(handler->opt)
+                switch (handler->opt)
                 {
                     case HO_RW:

trunk/src/VBox/Additions/linux/sharedfolders/regops.c ¶

@@ -1016 +1016 @@
 
     switch (file->f_flags & O_ACCMODE) {
-    case O_RDONLY:
-        pReq->CreateParms.CreateFlags |= SHFL_CF_ACCESS_READ;
-        sf_r->Handle.fFlags |= SF_HANDLE_F_READ;
-        break;
-
-    case O_WRONLY:
-        pReq->CreateParms.CreateFlags |= SHFL_CF_ACCESS_WRITE;
-        sf_r->Handle.fFlags |= SF_HANDLE_F_WRITE;
-        break;
-
-    case O_RDWR:
-        pReq->CreateParms.CreateFlags |= SHFL_CF_ACCESS_READWRITE;
-        sf_r->Handle.fFlags |= SF_HANDLE_F_READ | SF_HANDLE_F_WRITE;
-        break;
-
-    default:
-        BUG();
+        case O_RDONLY:
+            pReq->CreateParms.CreateFlags |= SHFL_CF_ACCESS_READ;
+            sf_r->Handle.fFlags |= SF_HANDLE_F_READ;
+            break;
+
+        case O_WRONLY:
+            pReq->CreateParms.CreateFlags |= SHFL_CF_ACCESS_WRITE;
+            sf_r->Handle.fFlags |= SF_HANDLE_F_WRITE;
+            break;
+
+        case O_RDWR:
+            pReq->CreateParms.CreateFlags |= SHFL_CF_ACCESS_READWRITE;
+            sf_r->Handle.fFlags |= SF_HANDLE_F_READ | SF_HANDLE_F_WRITE;
+            break;
+
+        default:
+            BUG();
     }