Addressing PR feedback

Author: Jonathan Miller

src/Common/src/Interop/FreeBSD/Interop.Libraries.cs

@@ -11,6 +11,5 @@ private static partial class Libraries
         internal const string INODE64SUFFIX = "";
 
         internal const string LibRt = "librt";  // POSIX Realtime Extensions library
-        internal const string libc = "libc";    // C runtime
     }
 }

src/Common/src/Interop/FreeBSD/libc/Interop.statfs.cs

@@ -51,4 +51,4 @@ internal static unsafe String GetMountPointFsType(statfs data)
             return Marshal.PtrToStringAnsi((IntPtr)data.f_fstypename);
         }
     }
-}
+}

src/Common/src/Interop/Linux/Interop.Libraries.cs

@@ -11,6 +11,5 @@ private static partial class Libraries
         internal const string INODE64SUFFIX = "";
 
         internal const string LibRt = "librt"; // POSIX Realtime Extensions library
-        internal const string libc = "libc";   // C runtime
     }
 }

src/Common/src/Interop/Linux/libc/Interop.statfs.cs

@@ -14,7 +14,7 @@ internal static partial class libc
         /// <remarks>
         /// These value names MUST be kept in sync with those in DriveInfo.Unix.GetDriveType
         /// </remarks>
-        internal enum LinuxFileSystemTypes : long
+        private enum LinuxFileSystemTypes : long
         {
             adfs = 0xadf5,
             affs = 0xADFF,
@@ -91,4 +91,4 @@ internal static unsafe String GetMountPointFsType(statfs data)
             return ((LinuxFileSystemTypes)data.f_type).ToString();
         }
     }
-}
+}

src/Common/src/Interop/OSX/Interop.Libraries.cs

@@ -16,7 +16,6 @@ private static partial class Libraries
 
         internal const string CoreFoundationLibrary = "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation";
         internal const string CoreServicesLibrary   = "/System/Library/Frameworks/CoreServices.framework/CoreServices";
-        internal const string libc = "libc";
         internal const string libproc = "libproc";
         internal const string LibSystemKernel = "/usr/lib/system/libsystem_kernel";
     }

src/Common/src/Interop/OSX/libc/Interop.statfs.cs

@@ -10,8 +10,8 @@ internal static partial class Interop
 {
     internal static partial class libc
     {
-        internal const int MAXPATHLEN = 1024;
-        internal const int MFSTYPENAMELEN = 16;
+        private const int MAXPATHLEN = 1024;
+        private const int MFSTYPENAMELEN = 16;
 
         [StructLayout(LayoutKind.Sequential)]
         internal unsafe struct fsid_t
@@ -45,4 +45,4 @@ internal static unsafe String GetMountPointFsType(statfs data)
             return Marshal.PtrToStringAnsi((IntPtr)data.f_fstypename);
         }
     }
-}
+}

src/Common/src/Interop/Unix/libc/Interop.mountpoints.cs

@@ -10,8 +10,6 @@ internal static partial class Interop
 {
     internal static partial class libc
     {
-        [DllImport("libc")]
-        static extern int printf(string data);
         /// <summary>
         /// Gets all the current mount points on the system
         /// </summary>
@@ -22,7 +20,7 @@ internal static partial class libc
         /// Do NOT free this memory...this memory is allocated by the OS, which is responsible for it.
         /// This call could also block for a bit to wait for slow network drives.
         /// </remarks>
-        [DllImport(Interop.Libraries.libc, EntryPoint = "getmntinfo" + Interop.Libraries.INODE64SUFFIX, SetLastError = true)]
+        [DllImport(Interop.Libraries.Libc, EntryPoint = "getmntinfo" + Interop.Libraries.INODE64SUFFIX, SetLastError = true)]
         internal static unsafe extern int getmntinfo(statfs** ppBuffer, int flags);
 
         /// <summary>
@@ -31,8 +29,8 @@ internal static partial class libc
         /// <param name="path">The path to retrieve the statfs for</param>
         /// <param name="buffer">The output statfs struct describing the mount point</param>
         /// <returns>Returns 0 on success, -1 on failure</returns>
-        [DllImport(Interop.Libraries.libc, EntryPoint = "statfs" + Interop.Libraries.INODE64SUFFIX, SetLastError = true)]
-        private static unsafe extern int get_statfs(string path, statfs* buffer);
+        [DllImport(Interop.Libraries.Libc, EntryPoint = "statfs" + Interop.Libraries.INODE64SUFFIX, SetLastError = true)]
+        private static unsafe extern int get_statfs(string path, out statfs buffer);
 
         /// <summary>
         /// Gets a statfs struct for a given mount point
@@ -42,7 +40,7 @@ internal static partial class libc
         internal static unsafe statfs GetStatFsForDriveName(string name)
         {
             statfs data = default(statfs);
-            int result = get_statfs(name, &data);
+            int result = get_statfs(name,  out data);
             if (result < 0)
             {
                 int errno = Marshal.GetLastWin32Error();
@@ -53,10 +51,8 @@ internal static unsafe statfs GetStatFsForDriveName(string name)
             }
             else
             {
-                printf(System.Runtime.InteropServices.Marshal.SizeOf<statfs>().ToString() + "\r\n");
-                printf("Should be here\r\n");
                 return data;
             }
         }
     }
-}
+}

src/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.Unix.cs

@@ -244,4 +244,4 @@ private static DriveType GetDriveType(string fileSystemName)
             }
         }
     }
-}
+}

src/System.IO.FileSystem.DriveInfo/src/System/IO/DriveType.cs

@@ -16,4 +16,4 @@ public enum DriveType
         CDRom = 5,
         Ram = 6
     }
-}
+}