Add FilePathMarshaler.FromManaged() and FromNative()

Author: dahlbyk

LibGit2Sharp/Core/FilePathMarshaler.cs

@@ -27,6 +27,16 @@ public override object MarshalNativeToManaged(IntPtr pNativeData)
             return (FilePath)NativeToString(pNativeData);
         }
 
+        public static IntPtr FromManaged(FilePath managedObj)
+        {
+            return staticInstance.MarshalManagedToNative(managedObj);
+        }
+
+        public new static FilePath FromNative(IntPtr pNativeData)
+        {
+            return (FilePath)staticInstance.MarshalNativeToManaged(pNativeData);
+        }
+
         public new static ICustomMarshaler GetInstance(string cookie)
         {
             return staticInstance;

LibGit2Sharp/Core/GitDiff.cs

@@ -26,15 +26,13 @@ internal class GitStrArrayIn : IDisposable
 
         public static GitStrArrayIn BuildFrom(FilePath[] paths)
         {
-            var marshaler = FilePathMarshaler.GetInstance(string.Empty);
-
             var nbOfPaths = paths.Length;
             var pathPtrs = new IntPtr[nbOfPaths];
 
             for (int i = 0; i < nbOfPaths; i++)
             {
                 var s = paths[i];
-                pathPtrs[i] = marshaler.MarshalManagedToNative(s);
+                pathPtrs[i] = FilePathMarshaler.FromManaged(s);
             }
 
             int dim = IntPtr.Size * nbOfPaths;

LibGit2Sharp/IndexEntry.cs

@@ -14,8 +14,6 @@ public class IndexEntry : IEquatable<IndexEntry>
 
         private Func<FileStatus> state;
 
-        private static readonly Utf8Marshaler marshaler = (Utf8Marshaler)Utf8Marshaler.GetInstance(string.Empty);
-
         /// <summary>
         ///   State of the version of the <see cref = "Blob" /> pointed at by this <see cref = "IndexEntry" />, 
         ///   compared against the <see cref = "Blob" /> known from the <see cref = "Repository.Head" /> and the file in the working directory.
@@ -39,7 +37,7 @@ internal static IndexEntry CreateFromPtr(Repository repo, IndexEntrySafeHandle h
         {
             GitIndexEntry entry = handle.MarshalAsGitIndexEntry();
 
-            FilePath path = (string)marshaler.MarshalNativeToManaged(entry.Path);
+            var path = FilePathMarshaler.FromNative(entry.Path);
 
             return new IndexEntry
                        {