Get rid of SignatureSafeHandle

Author: carlosmn

LibGit2Sharp/BlameHunk.cs

@@ -20,7 +20,7 @@ public class BlameHunk : IEquatable<BlameHunk>
  x =>x.InitialCommit);
 
 
-internalBlameHunk(IRepositoryrepository,GitBlameHunkrawHunk)
+internalunsafeBlameHunk(IRepositoryrepository,GitBlameHunkrawHunk)
 {
 finalCommit=newLazy<Commit>(()=>repository.Lookup<Commit>(rawHunk.FinalCommitId));
 origCommit=newLazy<Commit>(()=>repository.Lookup<Commit>(rawHunk.OrigCommitId));
@@ -36,12 +36,12 @@ internal BlameHunk(IRepository repository, GitBlameHunk rawHunk)
 InitialStartLineNumber=rawHunk.OrigStartLineNumber-1;
 
 // Signature objects need to have ownership of their native pointers
-if(rawHunk.FinalSignature!=IntPtr.Zero)
+if(rawHunk.FinalSignature!=null)
 {
 FinalSignature=newSignature(Proxy.git_signature_dup(rawHunk.FinalSignature));
 }
 
-if(rawHunk.OrigSignature!=IntPtr.Zero)
+if(rawHunk.OrigSignature!=null)
 {
 InitialSignature=newSignature(Proxy.git_signature_dup(rawHunk.OrigSignature));
 }

LibGit2Sharp/Core/GitBlame.cs

@@ -53,18 +53,18 @@ internal class GitBlameOptions
 }
 
 [StructLayout(LayoutKind.Sequential)]
-internalclassGitBlameHunk
+internalunsafeclassGitBlameHunk
 {
 publicushortLinesInHunk;
 
 publicGitOidFinalCommitId;
 publicushortFinalStartLineNumber;
-publicIntPtrFinalSignature;
+publicgit_signature*FinalSignature;
 
 publicGitOidOrigCommitId;
 publicIntPtrOrigPath;
 publicushortOrigStartLineNumber;
-publicIntPtrOrigSignature;
+publicgit_signature*OrigSignature;
 
 publicbyteBoundary;
 }

LibGit2Sharp/Core/GitSignature.cs

@@ -4,10 +4,10 @@
 namespaceLibGit2Sharp.Core
 {
 [StructLayout(LayoutKind.Sequential)]
-internalclassGitSignature
+internalunsafestructgit_signature
 {
-publicIntPtrName;
-publicIntPtrEmail;
-publicGitTimeWhen;
+publicchar*name;
+publicchar*email;
+publicgit_timewhen;
 }
 }

LibGit2Sharp/Core/GitTime.cs

@@ -3,9 +3,9 @@
 namespaceLibGit2Sharp.Core
 {
 [StructLayout(LayoutKind.Sequential)]
-internalclassGitTime
+internalunsafestructgit_time
 {
-publiclongTime;
-publicintOffset;
+publiclongtime;
+publicintoffset;
 }
 }

LibGit2Sharp/Core/Handles/Objects.cs

@@ -211,4 +211,73 @@ public void Dispose()
 }
 }
 
+internalunsafeclassSignatureHandle:IDisposable
+{
+git_signature*ptr;
+internalgit_signature*Handle
+{
+get
+{
+returnptr;
+}
+}
+
+boolowned;
+booldisposed;
+
+publicunsafeSignatureHandle(git_signature*handle,boolowned)
+{
+this.ptr=handle;
+this.owned=owned;
+}
+
+publicunsafeSignatureHandle(IntPtrptr,boolowned)
+{
+this.ptr=(git_signature*)ptr.ToPointer();
+this.owned=owned;
+}
+
+~SignatureHandle()
+{
+Dispose(false);
+}
+
+internalboolIsNull
+{
+get
+{
+returnptr==null;
+}
+}
+
+internalIntPtrAsIntPtr()
+{
+returnnewIntPtr(ptr);
+}
+
+voidDispose(booldisposing)
+{
+if(!disposed)
+{
+if(owned)
+{
+NativeMethods.git_signature_free(ptr);
+ptr=null;
+}
+}
+
+disposed=true;
+}
+
+publicvoidDispose()
+{
+Dispose(true);
+}
+
+publicstaticimplicitoperatorgit_signature*(SignatureHandlehandle)
+{
+returnhandle.Handle;
+}
+}
+
 }

LibGit2Sharp/Core/Handles/Objects.tt

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

LibGit2Sharp/Core/Handles/SignatureSafeHandle.cs

@@ -224,11 +224,11 @@ internal static extern int git_rebase_next(
 RebaseSafeHandlerebase);
 
 [DllImport(libgit2)]
-internalstaticexternintgit_rebase_commit(
+internalstaticexternunsafeintgit_rebase_commit(
 refGitOidid,
 RebaseSafeHandlerebase,
-SignatureSafeHandleauthor,
-SignatureSafeHandlecommitter,
+git_signature*author,
+git_signature*committer,
 IntPtrmessage_encoding,
 IntPtrmessage);
 
@@ -237,9 +237,9 @@ internal static extern int git_rebase_abort(
 RebaseSafeHandlerebase);
 
 [DllImport(libgit2)]
-internalstaticexternintgit_rebase_finish(
+internalstaticexternunsafeintgit_rebase_finish(
 RebaseSafeHandlerepo,
-SignatureSafeHandlesignature);
+git_signature*signature);
 
 [DllImport(libgit2)]
 internalstaticexternvoidgit_rebase_free(
@@ -285,18 +285,18 @@ internal static extern unsafe int git_clone(
 refGitCloneOptionsopts);
 
 [DllImport(libgit2)]
-internalstaticexternIntPtrgit_commit_author(GitObjectSafeHandlecommit);
+internalstaticexternunsafegit_signature*git_commit_author(GitObjectSafeHandlecommit);
 
 [DllImport(libgit2)]
-internalstaticexternIntPtrgit_commit_committer(GitObjectSafeHandlecommit);
+internalstaticexternunsafegit_signature*git_commit_committer(GitObjectSafeHandlecommit);
 
 [DllImport(libgit2)]
 internalstaticexternunsafeintgit_commit_create_from_ids(
 outGitOidid,
 git_repository*repo,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringupdateRef,
-SignatureSafeHandleauthor,
-SignatureSafeHandlecommitter,
+git_signature*author,
+git_signature*committer,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringencoding,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringmessage,
 refGitOidtree,
@@ -810,8 +810,8 @@ internal static extern unsafe int git_note_create(
 outGitOidnoteOid,
 git_repository*repo,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringnotes_ref,
-SignatureSafeHandleauthor,
-SignatureSafeHandlecommitter,
+git_signature*author,
+git_signature*committer,
 refGitOidoid,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringnote,
 intforce);
@@ -837,8 +837,8 @@ internal static extern unsafe int git_note_read(
 internalstaticexternunsafeintgit_note_remove(
 git_repository*repo,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringnotes_ref,
-SignatureSafeHandleauthor,
-SignatureSafeHandlecommitter,
+git_signature*author,
+git_signature*committer,
 refGitOidoid);
 
 [DllImport(libgit2)]
@@ -1102,7 +1102,7 @@ internal static extern ReflogEntrySafeHandle git_reflog_entry_byindex(
 SafeHandleentry);
 
 [DllImport(libgit2)]
-internalstaticexternIntPtrgit_reflog_entry_committer(
+internalstaticexternunsafegit_signature*git_reflog_entry_committer(
 SafeHandleentry);
 
 [DllImport(libgit2)]
@@ -1471,30 +1471,30 @@ internal static extern unsafe int git_revparse_ext(
 internalstaticexternvoidgit_revwalk_simplify_first_parent(RevWalkerSafeHandlewalk);
 
 [DllImport(libgit2)]
-internalstaticexternvoidgit_signature_free(IntPtrsignature);
+internalstaticexternunsafevoidgit_signature_free(git_signature*signature);
 
 [DllImport(libgit2)]
-internalstaticexternintgit_signature_new(
-outSignatureSafeHandlesignature,
+internalstaticexternunsafeintgit_signature_new(
+outgit_signature*signature,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringname,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringemail,
 longtime,
 intoffset);
 
 [DllImport(libgit2)]
-internalstaticexternintgit_signature_now(
-outSignatureSafeHandlesignature,
+internalstaticexternunsafeintgit_signature_now(
+outgit_signature*signature,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringname,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringemail);
 
 [DllImport(libgit2)]
-internalstaticexternintgit_signature_dup(outIntPtrdest,IntPtrsig);
+internalstaticexternunsafeintgit_signature_dup(outgit_signature*dest,git_signature*sig);
 
 [DllImport(libgit2)]
 internalstaticexternunsafeintgit_stash_save(
 outGitOidid,
 git_repository*repo,
-SignatureSafeHandlestasher,
+git_signature*stasher,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringmessage,
 StashModifiersflags);
 
@@ -1650,7 +1650,7 @@ internal static extern unsafe int git_tag_annotation_create(
 git_repository*repo,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringname,
 GitObjectSafeHandletarget,
-SignatureSafeHandlesignature,
+git_signature*signature,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringmessage);
 
 [DllImport(libgit2)]
@@ -1659,7 +1659,7 @@ internal static extern unsafe int git_tag_create(
 git_repository*repo,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringname,
 GitObjectSafeHandletarget,
-SignatureSafeHandlesignature,
+git_signature*signature,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringmessage,
 [MarshalAs(UnmanagedType.Bool)]
 boolforce);
@@ -1690,7 +1690,7 @@ internal static extern unsafe int git_tag_delete(
 internalstaticexternstringgit_tag_name(GitObjectSafeHandletag);
 
 [DllImport(libgit2)]
-internalstaticexternIntPtrgit_tag_tagger(GitObjectSafeHandletag);
+internalstaticexternunsafegit_signature*git_tag_tagger(GitObjectSafeHandletag);
 
 [DllImport(libgit2)]
 internalstaticexternunsafegit_oid*git_tag_target_id(GitObjectSafeHandletag);