fixup! Make string marshaling either lax or strict

Author: nulltoken

LibGit2Sharp/Core/EncodingMarshaler.cs

@@ -88,7 +88,7 @@ public static void Cleanup(IntPtr pNativeData)
             Marshal.FreeHGlobal(pNativeData);
         }
 
-        public static unsafe String FromNative(Encoding encoding, IntPtr pNativeData)
+        public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData)
         {
             if (pNativeData == IntPtr.Zero)
             {
@@ -112,7 +112,7 @@ public static unsafe String FromNative(Encoding encoding, IntPtr pNativeData)
             return new String((sbyte*)pNativeData.ToPointer(), 0, (int)(walk - start), encoding);
         }
 
-        public static unsafe String FromNative(Encoding encoding, IntPtr pNativeData, int length)
+        public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData, int length)
         {
             if (pNativeData == IntPtr.Zero)
             {
@@ -127,7 +127,7 @@ public static unsafe String FromNative(Encoding encoding, IntPtr pNativeData, in
             return new String((sbyte*)pNativeData.ToPointer(), 0, length, encoding);
         }
 
-        public static String FromBuffer(Encoding encoding, byte[] buffer)
+        public static string FromBuffer(Encoding encoding, byte[] buffer)
         {
             if (buffer == null)
             {

LibGit2Sharp/Core/FilePathMarshaler.cs

@@ -97,6 +97,11 @@ internal class LaxFilePathMarshaler : LaxUtf8Marshaler
     {
         private static readonly LaxFilePathMarshaler staticInstance = new LaxFilePathMarshaler();
 
+        public new static ICustomMarshaler GetInstance(String cookie)
+        {
+            return staticInstance;
+        }
+
         #region ICustomMarshaler
 
         public override Object MarshalNativeToManaged(IntPtr pNativeData)
@@ -106,11 +111,6 @@ public override Object MarshalNativeToManaged(IntPtr pNativeData)
 
         #endregion
 
-        public new static ICustomMarshaler GetInstance(String cookie)
-        {
-            return staticInstance;
-        }
-
         public new static FilePath FromNative(IntPtr pNativeData)
         {
             return LaxUtf8Marshaler.FromNative(pNativeData);