Changeset 37833 in vbox for trunk/src/VBox/Additions/solaris

Timestamp:

Jul 8, 2011 10:16:08 AM (14 years ago)

Author:

vboxsync

Message:

Additions/Solaris/SharedFolders/vboxfs_mount: small cleanup.

File:

• trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c (modified) (4 diffs)

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c

@@ -42 +42 @@
 *******************************************************************************/
 static char g_achOptBuf[MAX_MNTOPT_STR] = { '\0', };
-static int g_cbOptBuf = 0;
 static const int g_RetErr = 33;
 static const int g_RetMagic = 2;
@@ -62 +61 @@
            "     uid=UID            set the default file owner user id to UID\n"
            "     gid=GID            set the default file owner group id to GID\n"
-           "     stat_ttl=TTL       set the \"time to live\" (in ms) for the stat caches (default %d)\n"
+           "     stat_ttl=TTL       set the \"time to live\" (in ms) for the stat caches (default %d)\n", DEF_STAT_TTL_MS);
+    fprintf(stderr,
            "     fsync              honor fsync calls instead of ignoring them\n"
            "     ttl=TTL            set the \"time to live\" to TID for the dentry\n"
            "     iocharset CHARSET  use the character set CHARSET for i/o operations (default utf8)\n"
-           "     convertcp CHARSET  convert the shared folder name from the character set CHARSET to utf8\n\n", DEF_STAT_TTL_MS);
-    fprintf(stderr, "Less common used options:\n"
+           "     convertcp CHARSET  convert the shared folder name from the character set CHARSET to utf8\n\n"
+           "Less common used options:\n"
            "     noexec,exec,nodev,dev,nosuid,suid\n");
     exit(1);
@@ -129 +129 @@
                     return g_RetMagic;
                 }
-                g_cbOptBuf = strlen(g_achOptBuf);
                 break;
             }
@@ -150 +149 @@
     pszMount = argv[argc - 1];
 
-    rc = mount(pszSpecial, pszMount, mntFlags | MS_OPTIONSTR, DEVICE_NAME, NULL, 0, g_achOptBuf, MAX_MNTOPT_STR);
+    rc = mount(pszSpecial, pszMount, mntFlags | MS_OPTIONSTR, DEVICE_NAME, NULL, 0, g_achOptBuf, sizeof(g_achOptBuf));
     if (rc)
     {