Add Utf8Marshaler.FromManaged() and FromNative()

Author: dahlbyk

LibGit2Sharp/ContentChanges.cs

@@ -10,7 +10,6 @@ namespace LibGit2Sharp
     public class ContentChanges
     {
         private readonly StringBuilder patchBuilder = new StringBuilder();
-        private static readonly Utf8Marshaler marshaler = (Utf8Marshaler)Utf8Marshaler.GetInstance(string.Empty);
 
         protected ContentChanges()
         {
@@ -47,15 +46,15 @@ internal static bool IsBinaryDelta(GitDiffDelta delta)
 
         private int HunkCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, IntPtr header, uint headerlen)
         {
-            string decodedContent = marshaler.NativeToString(header, headerlen);
+            string decodedContent = Utf8Marshaler.FromNative(header, headerlen);
 
             PatchBuilder.AppendFormat("{0}", decodedContent);
             return 0;
         }
 
         private int LineCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, uint contentlen)
         {
-            string decodedContent = marshaler.NativeToString(content, contentlen);
+            string decodedContent = Utf8Marshaler.FromNative(content, contentlen);
 
             string prefix;
 

LibGit2Sharp/Core/Ensure.cs

@@ -10,8 +10,6 @@ namespace LibGit2Sharp.Core
     [DebuggerStepThrough]
     internal static class Ensure
     {
-        private static readonly Utf8Marshaler marshaler = (Utf8Marshaler)Utf8Marshaler.GetInstance(string.Empty);
-
         /// <summary>
         ///   Checks an argument to ensure it isn't null.
         /// </summary>
@@ -75,7 +73,7 @@ public static void Success(int result, bool allowPositiveResult = false)
             }
             else
             {
-                errorMessage = (string)marshaler.MarshalNativeToManaged(error.Message);
+                errorMessage = Utf8Marshaler.FromNative(error.Message);
             }
 
             throw new LibGit2SharpException(

LibGit2Sharp/Core/Libgit2UnsafeHelper.cs

@@ -6,8 +6,6 @@ namespace LibGit2Sharp.Core
 {
     internal static unsafe class Libgit2UnsafeHelper
     {
-        private static readonly Utf8Marshaler marshaler = (Utf8Marshaler)Utf8Marshaler.GetInstance(string.Empty);
-
         public static IList<string> ListAllBranchNames(RepositorySafeHandle repo, GitBranchType types)
         {
             UnSafeNativeMethods.git_strarray strArray;
@@ -55,7 +53,7 @@ private static IList<string> BuildListOf(UnSafeNativeMethods.git_strarray strArr
                 uint numberOfEntries = gitStrArray->size;
                 for (uint i = 0; i < numberOfEntries; i++)
                 {
-                    var name = (string)marshaler.MarshalNativeToManaged((IntPtr)gitStrArray->strings[i]);
+                    var name = Utf8Marshaler.FromNative((IntPtr)gitStrArray->strings[i]);
                     list.Add(name);
                 }
 

LibGit2Sharp/Core/Utf8Marshaler.cs

@@ -62,10 +62,10 @@ protected unsafe string NativeToString(IntPtr pNativeData)
 
             var length = (uint)(walk - (byte*)pNativeData);
 
-            return NativeToString(pNativeData, length);
+            return FromNative(pNativeData, length);
         }
 
-        public string NativeToString(IntPtr pNativeData, uint length)
+        public static string FromNative(IntPtr pNativeData, uint length)
         {
             // should not be null terminated
             var strbuf = new byte[length];
@@ -93,6 +93,16 @@ public int GetNativeDataSize()
 
         #endregion
 
+        public static IntPtr FromManaged(string managedObj)
+        {
+            return staticInstance.MarshalManagedToNative(managedObj);
+        }
+
+        public static string FromNative(IntPtr pNativeData)
+        {
+            return (string)staticInstance.MarshalNativeToManaged(pNativeData);
+        }
+
         public static ICustomMarshaler GetInstance(string cookie)
         {
             return staticInstance;

LibGit2Sharp/Signature.cs

@@ -14,17 +14,13 @@ public class Signature
         private readonly string name;
         private readonly string email;
 
-        private static readonly Utf8Marshaler marshaler = (Utf8Marshaler)Utf8Marshaler.GetInstance(string.Empty);
-
         internal Signature(IntPtr signaturePtr)
         {
             var handle = new GitSignature();
             Marshal.PtrToStructure(signaturePtr, handle);
 
-            // XXX: This is unbelievably hacky, but I can't get the 
-            // Utf8Marshaller to work properly.
-            name = (string)marshaler.MarshalNativeToManaged(handle.Name);
-            email = (string)marshaler.MarshalNativeToManaged(handle.Email);
+            name = Utf8Marshaler.FromNative(handle.Name);
+            email = Utf8Marshaler.FromNative(handle.Email);
             when = Epoch.ToDateTimeOffset(handle.When.Time, handle.When.Offset);
         }
 

LibGit2Sharp/TreeChanges.cs

@@ -13,8 +13,6 @@ namespace LibGit2Sharp
     /// </summary>
     public class TreeChanges : IEnumerable<TreeEntryChanges>
     {
-        private static readonly Utf8Marshaler marshaler = (Utf8Marshaler)Utf8Marshaler.GetInstance(string.Empty);
-
         private readonly IDictionary<string, TreeEntryChanges> changes = new Dictionary<string, TreeEntryChanges>();
         private readonly List<TreeEntryChanges> added = new List<TreeEntryChanges>();
         private readonly List<TreeEntryChanges> deleted = new List<TreeEntryChanges>();
@@ -43,8 +41,8 @@ internal TreeChanges(DiffListSafeHandle diff)
 
         private int PrintCallBack(IntPtr data, GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, uint contentlen)
         {
-            string formattedoutput = marshaler.NativeToString(content, contentlen);
-            var currentFilePath = (string)marshaler.MarshalNativeToManaged(delta.NewFile.Path);
+            var formattedoutput = Utf8Marshaler.FromNative(content, contentlen);
+            var currentFilePath = Utf8Marshaler.FromNative(delta.NewFile.Path);
 
             AddLineChange(currentFilePath, lineorigin);
 
@@ -87,8 +85,8 @@ private void IncrementLinesAdded(string filePath)
 
         private void AddFileChange(GitDiffDelta delta)
         {
-            var newFilePath = (string)marshaler.MarshalNativeToManaged(delta.NewFile.Path);
-            var oldFilePath = (string)marshaler.MarshalNativeToManaged(delta.OldFile.Path);
+            var newFilePath = Utf8Marshaler.FromNative(delta.NewFile.Path);
+            var oldFilePath = Utf8Marshaler.FromNative(delta.OldFile.Path);
             var newMode = (Mode)delta.NewFile.Mode;
             var oldMode = (Mode)delta.OldFile.Mode;
             var newOid = new ObjectId(delta.NewFile.Oid);