Get rid of StatusListSafeHandle

Author: carlosmn

LibGit2Sharp/Core/Handles/Objects.cs

@@ -280,4 +280,73 @@ public void Dispose()
 }
 }
 
+internalunsafeclassStatusListHandle:IDisposable
+{
+git_status_list*ptr;
+internalgit_status_list*Handle
+{
+get
+{
+returnptr;
+}
+}
+
+boolowned;
+booldisposed;
+
+publicunsafeStatusListHandle(git_status_list*handle,boolowned)
+{
+this.ptr=handle;
+this.owned=owned;
+}
+
+publicunsafeStatusListHandle(IntPtrptr,boolowned)
+{
+this.ptr=(git_status_list*)ptr.ToPointer();
+this.owned=owned;
+}
+
+~StatusListHandle()
+{
+Dispose(false);
+}
+
+internalboolIsNull
+{
+get
+{
+returnptr==null;
+}
+}
+
+internalIntPtrAsIntPtr()
+{
+returnnewIntPtr(ptr);
+}
+
+voidDispose(booldisposing)
+{
+if(!disposed)
+{
+if(owned)
+{
+NativeMethods.git_status_list_free(ptr);
+ptr=null;
+}
+}
+
+disposed=true;
+}
+
+publicvoidDispose()
+{
+Dispose(true);
+}
+
+publicstaticimplicitoperatorgit_status_list*(StatusListHandlehandle)
+{
+returnhandle.Handle;
+}
+}
+
 }

LibGit2Sharp/Core/Handles/Objects.tt

@@ -16,13 +16,15 @@ var cNames = new[]{
  "git_reference",
  "git_repository",
  "git_signature",
+ "git_status_list",
 };
 
 var csNames = new[]{
  "TreeEntryHandle",
  "ReferenceHandle",
  "RepositoryHandle",
  "SignatureHandle",
+ "StatusListHandle",
 };
 
 for (var i = 0; i < cNames.Length; i++)

LibGit2Sharp/Core/Handles/StatusListSafeHandle.cs

@@ -1534,22 +1534,22 @@ internal static extern unsafe int git_status_file(
 
 [DllImport(libgit2)]
 internalstaticexternunsafeintgit_status_list_new(
-outStatusListSafeHandlegit_status_list,
+outgit_status_list*git_status_list,
 git_repository*repo,
 GitStatusOptionsoptions);
 
 [DllImport(libgit2)]
-internalstaticexternintgit_status_list_entrycount(
-StatusListSafeHandlestatusList);
+internalstaticexternunsafeintgit_status_list_entrycount(
+git_status_list*statusList);
 
 [DllImport(libgit2)]
 internalstaticexternunsafegit_status_entry*git_status_byindex(
-StatusListSafeHandlelist,
+git_status_list*list,
 UIntPtridx);
 
 [DllImport(libgit2)]
-internalstaticexternvoidgit_status_list_free(
-IntPtrstatusList);
+internalstaticexternunsafevoidgit_status_list_free(
+git_status_list*statusList);
 
 [DllImport(libgit2)]
 internalstaticexternvoidgit_strarray_free(

LibGit2Sharp/Core/NativeMethods.cs

@@ -6,5 +6,6 @@ internal struct git_tree_entry{}
 internalstructgit_reference{}
 internalstructgit_refspec{}
 internalstructgit_repository{}
+internalstructgit_status_list{}
 }
 

LibGit2Sharp/Core/Opaques.cs

@@ -2833,31 +2833,26 @@ public static unsafe FileStatus git_status_file(RepositoryHandle repo, FilePath
 returnstatus;
 }
 
-publicstaticunsafeStatusListSafeHandlegit_status_list_new(RepositoryHandlerepo,GitStatusOptionsoptions)
+publicstaticunsafeStatusListHandlegit_status_list_new(RepositoryHandlerepo,GitStatusOptionsoptions)
 {
-StatusListSafeHandlehandle;
-intres=NativeMethods.git_status_list_new(outhandle,repo,options);
+git_status_list*ptr;
+intres=NativeMethods.git_status_list_new(outptr,repo,options);
 Ensure.ZeroResult(res);
-returnhandle;
+returnnewStatusListHandle(ptr,true);
 }
 
-publicstaticintgit_status_list_entrycount(StatusListSafeHandlelist)
+publicstaticunsafeintgit_status_list_entrycount(StatusListHandlelist)
 {
 intres=NativeMethods.git_status_list_entrycount(list);
 Ensure.Int32Result(res);
 returnres;
 }
 
-publicstaticunsafegit_status_entry*git_status_byindex(StatusListSafeHandlelist,longidx)
+publicstaticunsafegit_status_entry*git_status_byindex(StatusListHandlelist,longidx)
 {
 returnNativeMethods.git_status_byindex(list,(UIntPtr)idx);
 }
 
-publicstaticvoidgit_status_list_free(IntPtrstatusList)
-{
-NativeMethods.git_status_list_free(statusList);
-}
-
  #endregion
 
  #region git_submodule_

LibGit2Sharp/Core/Proxy.cs

@@ -158,7 +158,6 @@
  <CompileInclude="RefSpecDirection.cs" />
  <CompileInclude="Core\GitStatusEntry.cs" />
  <CompileInclude="Core\GitStatusOptions.cs" />
- <CompileInclude="Core\Handles\StatusListSafeHandle.cs" />
  <CompileInclude="RenameDetails.cs" />
  <CompileInclude="RevertResult.cs" />
  <CompileInclude="RevertOptions.cs" />

LibGit2Sharp/LibGit2Sharp.csproj

@@ -58,7 +58,7 @@ internal unsafe RepositoryStatus(Repository repo, StatusOptions options)
 statusEntries=newList<StatusEntry>();
 
 using(GitStatusOptionscoreOptions=CreateStatusOptions(options??newStatusOptions()))
-using(StatusListSafeHandlelist=Proxy.git_status_list_new(repo.Handle,coreOptions))
+using(StatusListHandlelist=Proxy.git_status_list_new(repo.Handle,coreOptions))
 {
 intcount=Proxy.git_status_list_entrycount(list);