Changeset 58143 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Oct 9, 2015 12:26:17 PM (9 years ago)

Author:

vboxsync

Message:

mount.vboxsf.c: Doxygen fix and some simplifications.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

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

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

@@ -628 +628 @@
  * @param dentry        directory cache entry
  * @param mode          file mode
+ * @param excl          Possible O_EXCL...
  * @returns 0 on success, Linux error code otherwise
  */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) || defined(DOXYGEN_RUNNING)
 static int sf_create(struct inode *parent, struct dentry *dentry, umode_t mode, bool excl)
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)

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

@@ +1 @@
+/* $Id$ */
 /** @file
- * vboxsf -- VirtualBox Guest Additions for Linux: mount(8) helper
+ * VirtualBox Guest Additions for Linux - mount(8) helper.
  *
  * Parses options provided by mount (or user directly)
@@ -8 +9 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +22 @@
 
 #ifndef _GNU_SOURCE
-#define _GNU_SOURCE
+# define _GNU_SOURCE
 #endif
 
 /* #define DEBUG */
-#define DBG if (0)
 #include <errno.h>
 #include <fcntl.h>
@@ -46 +46 @@
 #include "vbsfmount.h"
 
-/* Compile-time assertion.  If a == 0, we get two identical switch cases, which is not
-   allowed. */
-#define CT_ASSERT(a) \
-    do { \
-        switch(0) { case 0: case (a): ; } \
-    } while (0)
+#include <iprt/assert.h>
+
 
 #define PANIC_ATTR __attribute ((noreturn, __format__ (__printf__, 1, 2)))
@@ -129 +125 @@
         int has_arg;
         const char *desc;
-    } handlers[]
-    =
+    } handlers[] =
     {
         {"rw",        HORW,        0, "mount read write (default)"},
@@ -337 +332 @@
   * Print out a usage message and exit.
   *
-  * @param name The name of the application
+  * @returns 1
+  * @param   argv0      The name of the application
   */
-static void __attribute ((noreturn)) usage(char *name)
+static int usage(char *argv0)
 {
     printf("Usage: %s [OPTIONS] NAME MOUNTPOINT\n"
@@ -349 +345 @@
            "  -s                    sloppy parsing, ignore unrecognized mount options\n"
            "  -o OPTION[,OPTION...] use the mount options specified\n"
-           "\n", name);
+           "\n", argv0);
     printf("Available mount options are:\n"
            "     rw                 mount writable (the default)\n"
@@ -367 +363 @@
     printf("Less common used options:\n"
            "     noexec,exec,nodev,dev,nosuid,suid\n");
-    exit(1);
+    return EXIT_FAILURE;
 }
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
     int c;
@@ -398 +394 @@
         NULL,  /* convertcp */
     };
+    AssertCompile(sizeof(uid_t) == sizeof(int));
+    AssertCompile(sizeof(gid_t) == sizeof(int));
 
     mntinf.nullchar = '\0';
@@ -411 +409 @@
         argv[0] = "mount.vboxsf";
 
-    /* Compile-time assertions */
-    CT_ASSERT(sizeof(uid_t) == sizeof(int));
-    CT_ASSERT(sizeof(gid_t) == sizeof(int));
-
     while ((c = getopt(argc, argv, "rwsno:h")) != -1)
     {
@@ -423 +417 @@
             case '?':
             case 'h':
-                usage(argv[0]);
+                return usage(argv[0]);
 
             case 'r':
@@ -447 +441 @@
 
     if (argc - optind < 2)
-        usage(argv[0]);
+        return usage(argv[0]);
 
     host_name = argv[optind];
@@ -551 +545 @@
     exit(EXIT_SUCCESS);
 }
+