Fix wrong interop return types

nulltoken · nulltoken · commit ba5f7d2984f8 · 2015-04-09T11:36:06.000+02:00
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -564,7 +564,7 @@ internal static extern IndexEntrySafeHandle git_index_get_bypath(
         internal static extern int git_index_has_conflicts(IndexSafeHandle index);
 
         [DllImport(libgit2)]
-        internal static extern uint git_index_name_entrycount(IndexSafeHandle handle);
+        internal static extern UIntPtr git_index_name_entrycount(IndexSafeHandle handle);
 
         [DllImport(libgit2)]
         internal static extern IndexNameEntrySafeHandle git_index_name_get_byindex(IndexSafeHandle handle, UIntPtr n);
@@ -586,7 +586,7 @@ internal static extern int git_index_remove_bypath(
 
 
         [DllImport(libgit2)]
-        internal static extern uint git_index_reuc_entrycount(IndexSafeHandle handle);
+        internal static extern UIntPtr git_index_reuc_entrycount(IndexSafeHandle handle);
 
         [DllImport(libgit2)]
         internal static extern IndexReucEntrySafeHandle git_index_reuc_get_byindex(IndexSafeHandle handle, UIntPtr n);
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -942,12 +942,8 @@ public static Conflict git_index_conflict_get(
 
         public static int git_index_entrycount(IndexSafeHandle index)
         {
-            UIntPtr count = NativeMethods.git_index_entrycount(index);
-            if ((long)count > int.MaxValue)
-            {
-                throw new LibGit2SharpException("Index entry count exceeds size of int");
-            }
-            return (int)count;
+            return NativeMethods.git_index_entrycount(index)
+                .ConvertToInt();
         }
 
         public static StageLevel git_index_entry_stage(IndexEntrySafeHandle index)
@@ -982,12 +978,8 @@ public static bool git_index_has_conflicts(IndexSafeHandle index)
 
         public static int git_index_name_entrycount(IndexSafeHandle index)
         {
-            uint count = NativeMethods.git_index_name_entrycount(index);
-            if ((long)count > int.MaxValue)
-            {
-                throw new LibGit2SharpException("Index name entry count exceeds size of int");
-            }
-            return (int)count;
+            return NativeMethods.git_index_name_entrycount(index)
+                .ConvertToInt();
         }
 
         public static IndexNameEntrySafeHandle git_index_name_get_byindex(IndexSafeHandle index, UIntPtr n)
@@ -1027,12 +1019,8 @@ public static void git_index_remove_bypath(IndexSafeHandle index, FilePath path)
 
         public static int git_index_reuc_entrycount(IndexSafeHandle index)
         {
-            uint count = NativeMethods.git_index_reuc_entrycount(index);
-            if ((long)count > int.MaxValue)
-            {
-                throw new LibGit2SharpException("Index REUC entry count exceeds size of int");
-            }
-            return (int)count;
+            return NativeMethods.git_index_reuc_entrycount(index)
+                .ConvertToInt();
         }
 
         public static IndexReucEntrySafeHandle git_index_reuc_get_byindex(IndexSafeHandle index, UIntPtr n)
