fixup! Make string marshaling either lax or strict

Author: nulltoken

LibGit2Sharp/Core/FilePathMarshaler.cs

@@ -75,12 +75,6 @@ public override IntPtr MarshalManagedToNative(Object managedObj)
             return FromManaged(filePath);
         }
 
-        public override Object MarshalNativeToManaged(IntPtr pNativeData)
-        {
-            throw new InvalidOperationException(
-                string.Format("{0} cannot be used to retrieve data from libgit2.", GetType().Name));
-        }
-
         #endregion
 
         public static IntPtr FromManaged(FilePath filePath)
@@ -99,43 +93,32 @@ public static IntPtr FromManaged(FilePath filePath)
     /// converting it to a managed FilePath instance. The marshaler will free the native pointer
     /// after conversion.
     /// </summary>
-    internal class LaxFilePathMarshaler : EncodingMarshaler
+    internal class LaxFilePathMarshaler : LaxUtf8Marshaler
     {
         private static readonly LaxFilePathMarshaler staticInstance = new LaxFilePathMarshaler();
 
-        private static readonly Encoding encoding = new UTF8Encoding(true, false);
-
-        public LaxFilePathMarshaler() : base(encoding)
-        { }
-
         #region ICustomMarshaler
 
-        public override IntPtr MarshalManagedToNative(object managedObj)
-        {
-            throw new InvalidOperationException(
-                string.Format("{0} cannot be used to pass data to libgit2.", GetType().Name));
-        }
-
         public override Object MarshalNativeToManaged(IntPtr pNativeData)
         {
             return FromNative(pNativeData);
         }
 
         #endregion
 
-        public static ICustomMarshaler GetInstance(String cookie)
+        public new static ICustomMarshaler GetInstance(String cookie)
         {
             return staticInstance;
         }
 
-        public static FilePath FromNative(IntPtr pNativeData)
+        public new static FilePath FromNative(IntPtr pNativeData)
         {
-            return FromNative(encoding, pNativeData);
+            return LaxUtf8Marshaler.FromNative(pNativeData);
         }
 
-        public static FilePath FromBuffer(byte[] buffer)
+        public new static FilePath FromBuffer(byte[] buffer)
         {
-            return FromBuffer(encoding, buffer);
+            return LaxUtf8Marshaler.FromBuffer(buffer);
         }
     }
 }

LibGit2Sharp/Core/Utf8Marshaler.cs

@@ -115,7 +115,7 @@ public static string FromNative(IntPtr pNativeData)
             return FromNative(encoding, pNativeData);
         }
 
-        public static String FromNative(IntPtr pNativeData, int length)
+        public static string FromNative(IntPtr pNativeData, int length)
         {
             return FromNative(encoding, pNativeData, length);
         }