Fix wrongly declared interop signature

nulltoken · nulltoken · commit 0690be7eca2f · 2012-05-26T12:55:14.000+02:00
diff --git a/LibGit2Sharp/Configuration.cs b/LibGit2Sharp/Configuration.cs
@@ -62,11 +62,11 @@ public bool HasSystemConfig
             get { return systemConfigPath != null; }
         }
 
-        private static string ConvertPath(Func<byte[], IntPtr, int> pathRetriever)
+        private static string ConvertPath(Func<byte[], uint, int> pathRetriever)
         {
             var buffer = new byte[NativeMethods.GIT_PATH_MAX];
 
-            int result = pathRetriever(buffer, new IntPtr(NativeMethods.GIT_PATH_MAX));
+            int result = pathRetriever(buffer, NativeMethods.GIT_PATH_MAX);
 
             if (result == (int)GitErrorCode.GIT_ENOTFOUND)
             {
diff --git a/LibGit2Sharp/ContentChanges.cs b/LibGit2Sharp/ContentChanges.cs
@@ -10,6 +10,7 @@ namespace LibGit2Sharp
     public class ContentChanges
     {
         private readonly StringBuilder patchBuilder = new StringBuilder();
+        private static readonly Utf8Marshaler marshaler = (Utf8Marshaler)Utf8Marshaler.GetInstance(string.Empty);
 
         protected ContentChanges()
         {
@@ -44,22 +45,17 @@ internal static bool IsBinaryDelta(GitDiffDelta delta)
             return delta.OldFile.Flags.Has(GitDiffFileFlags.GIT_DIFF_FILE_BINARY) || delta.NewFile.Flags.Has(GitDiffFileFlags.GIT_DIFF_FILE_BINARY);
         }
 
-        private static string NativeToString(IntPtr content, IntPtr contentlen)
+        private int HunkCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, IntPtr header, uint headerlen)
         {
-            return ((Utf8Marshaler)(Utf8Marshaler.GetInstance(string.Empty))).NativeToString(content, contentlen.ToInt32());
-        }
-
-        private int HunkCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, IntPtr header, IntPtr headerlen)
-        {
-            string decodedContent = NativeToString(header, headerlen);
+            string decodedContent = marshaler.NativeToString(header, headerlen);
 
             PatchBuilder.AppendFormat("{0}", decodedContent);
             return 0;
         }
 
-        private int LineCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, IntPtr contentlen)
+        private int LineCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, uint contentlen)
         {
-            string decodedContent = NativeToString(content, contentlen);
+            string decodedContent = marshaler.NativeToString(content, contentlen);
 
             string prefix;
 
diff --git a/LibGit2Sharp/Core/Ensure.cs b/LibGit2Sharp/Core/Ensure.cs
@@ -70,7 +70,7 @@ public static void Success(int result, bool allowPositiveResult = false)
 
             throw new LibGit2Exception(
                 String.Format(CultureInfo.InvariantCulture, "An error was raised by libgit2. Class = {0} ({1}).{2}{3}",
-                              Enum.GetName(typeof(GitErrorType), error.Klass.ToInt32()),
+                              Enum.GetName(typeof(GitErrorType), error.Klass),
                               result,
                               Environment.NewLine,
                               errorMessage));
diff --git a/LibGit2Sharp/Core/GitDiff.cs b/LibGit2Sharp/Core/GitDiff.cs
@@ -59,17 +59,17 @@ internal class GitDiffDelta
         public GitDiffFile OldFile;
         public GitDiffFile NewFile;
         public ChangeKind Status;
-        public UIntPtr Similarity;
-        public IntPtr Binary;
+        public uint Similarity;
+        public int Binary;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal class GitDiffRange
     {
-        public IntPtr OldStart;
-        public IntPtr OldLines;
-        public IntPtr NewStart;
-        public IntPtr NewLines;
+        public int OldStart;
+        public int OldLines;
+        public int NewStart;
+        public int NewLines;
     }
 
     enum GitDiffLineOrigin : byte
@@ -85,4 +85,4 @@ enum GitDiffLineOrigin : byte
         GIT_DIFF_LINE_HUNK_HDR = 0x48, //'H',
         GIT_DIFF_LINE_BINARY = 0x42, //'B',
     }
-}
+}
diff --git a/LibGit2Sharp/Core/GitError.cs b/LibGit2Sharp/Core/GitError.cs
@@ -7,7 +7,7 @@ namespace LibGit2Sharp.Core
     internal class GitError
     {
         public IntPtr Message;
-        public IntPtr Klass;
+        public int Klass;
     }
 
     internal enum GitErrorType
diff --git a/LibGit2Sharp/Core/Libgit2UnsafeHelper.cs b/LibGit2Sharp/Core/Libgit2UnsafeHelper.cs
@@ -52,7 +52,7 @@ private static IList<string> BuildListOf(UnSafeNativeMethods.git_strarray strArr
             {
                 UnSafeNativeMethods.git_strarray* gitStrArray = &strArray;
 
-                int numberOfEntries = gitStrArray->size.ToInt32();
+                uint numberOfEntries = gitStrArray->size;
                 for (uint i = 0; i < numberOfEntries; i++)
                 {
                     var name = (string)marshaler.MarshalNativeToManaged((IntPtr)gitStrArray->strings[i]);
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -9,7 +9,7 @@ namespace LibGit2Sharp.Core
 {
     internal static class NativeMethods
     {
-        public const int GIT_PATH_MAX = 4096;
+        public const uint GIT_PATH_MAX = 4096;
         private const string libgit2 = "git2";
 
         static NativeMethods()
@@ -149,10 +149,10 @@ public static extern int git_commit_create(
         public static extern int git_config_delete(ConfigurationSafeHandle cfg, string name);
 
         [DllImport(libgit2)]
-        public static extern int git_config_find_global(byte[] global_config_path, IntPtr length);
+        public static extern int git_config_find_global(byte[] global_config_path, uint length);
 
         [DllImport(libgit2)]
-        public static extern int git_config_find_system(byte[] system_config_path, IntPtr length);
+        public static extern int git_config_find_system(byte[] system_config_path, uint length);
 
         [DllImport(libgit2)]
         public static extern void git_config_free(IntPtr cfg);
@@ -259,7 +259,7 @@ internal delegate int git_diff_hunk_fn(
             GitDiffDelta delta,
             GitDiffRange range,
             IntPtr header,
-            IntPtr headerLen);
+            uint headerLen);
 
         [DllImport(libgit2)]
         public static extern int git_diff_foreach(
@@ -275,7 +275,7 @@ internal delegate int git_diff_data_fn(
             GitDiffRange range, 
             GitDiffLineOrigin lineOrigin,
             IntPtr content,
-            IntPtr contentLen);
+            uint contentLen);
 
         [DllImport(libgit2)]
         public static extern int git_diff_print_patch(
diff --git a/LibGit2Sharp/Core/UnSafeNativeMethods.cs b/LibGit2Sharp/Core/UnSafeNativeMethods.cs
@@ -28,7 +28,7 @@ internal static unsafe class UnSafeNativeMethods
         internal struct git_strarray
         {
             public sbyte** strings;
-            public IntPtr size;
+            public uint size;
         }
 
         #endregion
diff --git a/LibGit2Sharp/Core/Utf8Marshaler.cs b/LibGit2Sharp/Core/Utf8Marshaler.cs
@@ -59,18 +59,19 @@ protected unsafe string NativeToString(IntPtr pNativeData)
             {
                 walk++;
             }
-            var length = (int)(walk - (byte*)pNativeData);
+
+            var length = (uint)(walk - (byte*)pNativeData);
 
             return NativeToString(pNativeData, length);
         }
 
-        public string NativeToString(IntPtr pNativeData, int length)
+        public string NativeToString(IntPtr pNativeData, uint length)
         {
             // should not be null terminated
             var strbuf = new byte[length];
 
             // skip the trailing null
-            Marshal.Copy(pNativeData, strbuf, 0, length);
+            Marshal.Copy(pNativeData, strbuf, 0, (int)length);
             string data = Encoding.UTF8.GetString(strbuf);
             return data;
         }
diff --git a/LibGit2Sharp/TreeChanges.cs b/LibGit2Sharp/TreeChanges.cs
@@ -41,9 +41,9 @@ internal TreeChanges(DiffListSafeHandle diff)
             Ensure.Success(NativeMethods.git_diff_print_patch(diff, IntPtr.Zero, PrintCallBack));
         }
 
-        private int PrintCallBack(IntPtr data, GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, IntPtr contentlen)
+        private int PrintCallBack(IntPtr data, GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, uint contentlen)
         {
-            string formattedoutput = marshaler.NativeToString(content, contentlen.ToInt32());
+            string formattedoutput = marshaler.NativeToString(content, contentlen);
             var currentFilePath = (string)marshaler.MarshalNativeToManaged(delta.NewFile.Path);
 
             AddLineChange(currentFilePath, lineorigin);

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,11 @@ public bool HasSystemConfig`
`62`	`62`	`get { return systemConfigPath != null; }`
`63`	`63`	`}`
`64`	`64`
`65`		`- private static string ConvertPath(Func<byte[], IntPtr, int> pathRetriever)`
	`65`	`+ private static string ConvertPath(Func<byte[], uint, int> pathRetriever)`
`66`	`66`	`{`
`67`	`67`	`var buffer = new byte[NativeMethods.GIT_PATH_MAX];`
`68`	`68`
`69`		`- int result = pathRetriever(buffer, new IntPtr(NativeMethods.GIT_PATH_MAX));`
	`69`	`+ int result = pathRetriever(buffer, NativeMethods.GIT_PATH_MAX);`
`70`	`70`
`71`	`71`	`if (result == (int)GitErrorCode.GIT_ENOTFOUND)`
`72`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ namespace LibGit2Sharp`
`10`	`10`	`public class ContentChanges`
`11`	`11`	`{`
`12`	`12`	`private readonly StringBuilder patchBuilder = new StringBuilder();`
	`13`	`+ private static readonly Utf8Marshaler marshaler = (Utf8Marshaler)Utf8Marshaler.GetInstance(string.Empty);`
`13`	`14`
`14`	`15`	`protected ContentChanges()`
`15`	`16`	`{`
`@@ -44,22 +45,17 @@ internal static bool IsBinaryDelta(GitDiffDelta delta)`
`44`	`45`	`return delta.OldFile.Flags.Has(GitDiffFileFlags.GIT_DIFF_FILE_BINARY) \|\| delta.NewFile.Flags.Has(GitDiffFileFlags.GIT_DIFF_FILE_BINARY);`
`45`	`46`	`}`
`46`	`47`
`47`		`- private static string NativeToString(IntPtr content, IntPtr contentlen)`
	`48`	`+ private int HunkCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, IntPtr header, uint headerlen)`
`48`	`49`	`{`
`49`		`- return ((Utf8Marshaler)(Utf8Marshaler.GetInstance(string.Empty))).NativeToString(content, contentlen.ToInt32());`
`50`		`- }`
`51`		`-`
`52`		`- private int HunkCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, IntPtr header, IntPtr headerlen)`
`53`		`- {`
`54`		`- string decodedContent = NativeToString(header, headerlen);`
	`50`	`+ string decodedContent = marshaler.NativeToString(header, headerlen);`
`55`	`51`
`56`	`52`	`PatchBuilder.AppendFormat("{0}", decodedContent);`
`57`	`53`	`return 0;`
`58`	`54`	`}`
`59`	`55`
`60`		`- private int LineCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, IntPtr contentlen)`
	`56`	`+ private int LineCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, uint contentlen)`
`61`	`57`	`{`
`62`		`- string decodedContent = NativeToString(content, contentlen);`
	`58`	`+ string decodedContent = marshaler.NativeToString(content, contentlen);`
`63`	`59`
`64`	`60`	`string prefix;`
`65`	`61`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace LibGit2Sharp.Core`
`7`	`7`	`internal class GitError`
`8`	`8`	`{`
`9`	`9`	`public IntPtr Message;`
`10`		`- public IntPtr Klass;`
	`10`	`+ public int Klass;`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`internal enum GitErrorType`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ private static IList<string> BuildListOf(UnSafeNativeMethods.git_strarray strArr`
`52`	`52`	`{`
`53`	`53`	`UnSafeNativeMethods.git_strarray* gitStrArray = &strArray;`
`54`	`54`
`55`		`- int numberOfEntries = gitStrArray->size.ToInt32();`
	`55`	`+ uint numberOfEntries = gitStrArray->size;`
`56`	`56`	`for (uint i = 0; i < numberOfEntries; i++)`
`57`	`57`	`{`
`58`	`58`	`var name = (string)marshaler.MarshalNativeToManaged((IntPtr)gitStrArray->strings[i]);`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ internal static unsafe class UnSafeNativeMethods`
`28`	`28`	`internal struct git_strarray`
`29`	`29`	`{`
`30`	`30`	`public sbyte** strings;`
`31`		`- public IntPtr size;`
	`31`	`+ public uint size;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -59,18 +59,19 @@ protected unsafe string NativeToString(IntPtr pNativeData)`
`59`	`59`	`{`
`60`	`60`	`walk++;`
`61`	`61`	`}`
`62`		`- var length = (int)(walk - (byte*)pNativeData);`
	`62`	`+`
	`63`	`+ var length = (uint)(walk - (byte*)pNativeData);`
`63`	`64`
`64`	`65`	`return NativeToString(pNativeData, length);`
`65`	`66`	`}`
`66`	`67`
`67`		`- public string NativeToString(IntPtr pNativeData, int length)`
	`68`	`+ public string NativeToString(IntPtr pNativeData, uint length)`
`68`	`69`	`{`
`69`	`70`	`// should not be null terminated`
`70`	`71`	`var strbuf = new byte[length];`
`71`	`72`
`72`	`73`	`// skip the trailing null`
`73`		`- Marshal.Copy(pNativeData, strbuf, 0, length);`
	`74`	`+ Marshal.Copy(pNativeData, strbuf, 0, (int)length);`
`74`	`75`	`string data = Encoding.UTF8.GetString(strbuf);`
`75`	`76`	`return data;`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ internal TreeChanges(DiffListSafeHandle diff)`
`41`	`41`	`Ensure.Success(NativeMethods.git_diff_print_patch(diff, IntPtr.Zero, PrintCallBack));`
`42`	`42`	`}`
`43`	`43`
`44`		`- private int PrintCallBack(IntPtr data, GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, IntPtr contentlen)`
	`44`	`+ private int PrintCallBack(IntPtr data, GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, uint contentlen)`
`45`	`45`	`{`
`46`		`- string formattedoutput = marshaler.NativeToString(content, contentlen.ToInt32());`
	`46`	`+ string formattedoutput = marshaler.NativeToString(content, contentlen);`
`47`	`47`	`var currentFilePath = (string)marshaler.MarshalNativeToManaged(delta.NewFile.Path);`
`48`	`48`
`49`	`49`	`AddLineChange(currentFilePath, lineorigin);`