Get rid of the rest of MarshalAs

This removes the last of the instances where we copy the C struct into a managed struct, where we're just going to copy it to another managed struct. Instead copy straight from the unmanaged to memanged memory just once.

Author: carlosmn

LibGit2Sharp/BlameHunk.cs

@@ -19,31 +19,34 @@ public class BlameHunk : IEquatable<BlameHunk>
  x =>x.InitialSignature,
  x =>x.InitialCommit);
 
-
-internalunsafeBlameHunk(IRepositoryrepository,GitBlameHunkrawHunk)
+internalunsafeBlameHunk(IRepositoryrepository,git_blame_hunk*rawHunk)
 {
-finalCommit=newLazy<Commit>(()=>repository.Lookup<Commit>(rawHunk.FinalCommitId));
-origCommit=newLazy<Commit>(()=>repository.Lookup<Commit>(rawHunk.OrigCommitId));
+varorigId=ObjectId.BuildFromPtr(&rawHunk->orig_commit_id);
+varfinalId=ObjectId.BuildFromPtr(&rawHunk->final_commit_id);
+
+finalCommit=newLazy<Commit>(()=>repository.Lookup<Commit>(finalId));
+origCommit=newLazy<Commit>(()=>repository.Lookup<Commit>(origId));
+
 
-if(rawHunk.OrigPath!=IntPtr.Zero)
+if(rawHunk->orig_path!=null)
 {
-InitialPath=LaxUtf8Marshaler.FromNative(rawHunk.OrigPath);
+InitialPath=LaxUtf8Marshaler.FromNative(rawHunk->orig_path);
 }
-LineCount=rawHunk.LinesInHunk;
+LineCount=rawHunk->lines_in_hunk;
 
 // Libgit2's line numbers are 1-based
-FinalStartLineNumber=rawHunk.FinalStartLineNumber-1;
-InitialStartLineNumber=rawHunk.OrigStartLineNumber-1;
+FinalStartLineNumber=rawHunk->final_start_line_number-1;
+InitialStartLineNumber=rawHunk->orig_start_line_number-1;
 
 // Signature objects need to have ownership of their native pointers
-if(rawHunk.FinalSignature!=null)
+if(rawHunk->final_signature!=null)
 {
-FinalSignature=newSignature(Proxy.git_signature_dup(rawHunk.FinalSignature));
+FinalSignature=newSignature(rawHunk->final_signature);
 }
 
-if(rawHunk.OrigSignature!=null)
+if(rawHunk->orig_signature!=null)
 {
-InitialSignature=newSignature(Proxy.git_signature_dup(rawHunk.OrigSignature));
+InitialSignature=newSignature(rawHunk->orig_signature);
 }
 }
 

LibGit2Sharp/BlameHunkCollection.cs

@@ -2,6 +2,7 @@
 usingSystem.Collections;
 usingSystem.Collections.Generic;
 usingSystem.Linq;
+usingSystem.Runtime.InteropServices;
 usingLibGit2Sharp.Core;
 usingLibGit2Sharp.Core.Handles;
 
@@ -20,26 +21,32 @@ public class BlameHunkCollection : IEnumerable<BlameHunk>
 /// </summary>
 protectedBlameHunkCollection(){}
 
-internalBlameHunkCollection(Repositoryrepo,RepositoryHandlerepoHandle,stringpath,BlameOptionsoptions)
+internalunsafeBlameHunkCollection(Repositoryrepo,RepositoryHandlerepoHandle,stringpath,BlameOptionsoptions)
 {
 this.repo=repo;
 
-varrawopts=newGitBlameOptions
+varrawopts=newgit_blame_options
 {
 version=1,
 flags=options.Strategy.ToGitBlameOptionFlags(),
-MinLine=(uint)options.MinLine,
-MaxLine=(uint)options.MaxLine,
+min_line=(uint)options.MinLine,
+max_line=(uint)options.MaxLine,
 };
 
 if(options.StartingAt!=null)
 {
-rawopts.NewestCommit=repo.Committish(options.StartingAt).Oid;
+ fixed (byte*p=rawopts.newest_commit.Id)
+{
+Marshal.Copy(repo.Committish(options.StartingAt).Oid.Id,0,newIntPtr(p),git_oid.Size);
+}
 }
 
 if(options.StoppingAt!=null)
 {
-rawopts.OldestCommit=repo.Committish(options.StoppingAt).Oid;
+ fixed (byte*p=rawopts.oldest_commit.Id)
+{
+Marshal.Copy(repo.Committish(options.StoppingAt).Oid.Id,0,newIntPtr(p),git_oid.Size);
+}
 }
 
 using(varblameHandle=Proxy.git_blame_file(repoHandle,path,rawopts))

LibGit2Sharp/CertificateSsh.cs

@@ -1,4 +1,6 @@
-usingLibGit2Sharp.Core;
+usingSystem;
+usingSystem.Runtime.InteropServices;
+usingLibGit2Sharp.Core;
 
 namespaceLibGit2Sharp
 {
@@ -37,17 +39,29 @@ protected CertificateSsh()
 /// True if we have the SHA1 hostkey hash from the server
 /// </summary>public readonly bool HasSHA1;
 
-internalCertificateSsh(GitCertificateSshcert)
+internalunsafeCertificateSsh(git_certificate_ssh*cert)
 {
 
-HasMD5=cert.type.HasFlag(GitCertificateSshType.MD5);
-HasSHA1=cert.type.HasFlag(GitCertificateSshType.SHA1);
+HasMD5=cert->type.HasFlag(GitCertificateSshType.MD5);
+HasSHA1=cert->type.HasFlag(GitCertificateSshType.SHA1);
 
 HashMD5=newbyte[16];
-cert.HashMD5.CopyTo(HashMD5,0);
+ fixed (byte*p=&HashMD5[0])
+{
+for(vari=0;i<HashMD5.Length;i++)
+{
+HashMD5[i]=p[i];
+}
+}
 
 HashSHA1=newbyte[20];
-cert.HashSHA1.CopyTo(HashSHA1,0);
+ fixed (byte*p=&HashSHA1[0])
+{
+for(vari=0;i<HashSHA1.Length;i++)
+{
+HashMD5[i]=p[i];
+}
+}
 }
 }
 }

LibGit2Sharp/CertificateX509.cs

@@ -1,4 +1,5 @@
-usingSystem.Runtime.InteropServices;
+usingSystem;
+usingSystem.Runtime.InteropServices;
 usingSystem.Security.Cryptography.X509Certificates;
 usingLibGit2Sharp.Core;
 
@@ -21,11 +22,11 @@ protected CertificateX509()
 /// </summary>
 publicvirtualX509CertificateCertificate{get;privateset;}
 
-internalCertificateX509(GitCertificateX509cert)
+internalunsafeCertificateX509(git_certificate_x509*cert)
 {
-intlen=checked((int)cert.len.ToUInt32());
+intlen=checked((int)cert->len.ToUInt32());
 byte[]data=newbyte[len];
-Marshal.Copy(cert.data,data,0,len);
+Marshal.Copy(newIntPtr(cert->data),data,0,len);
 Certificate=newX509Certificate(data);
 }
 }

LibGit2Sharp/Core/GitBlame.cs

@@ -41,32 +41,32 @@ internal enum GitBlameOptionFlags
 }
 
 [StructLayout(LayoutKind.Sequential)]
-internalclassGitBlameOptions
+internalclassgit_blame_options
 {
 publicuintversion=1;
 publicGitBlameOptionFlagsflags;
-publicUInt16MinMatchCharacters;
-publicGitOidNewestCommit;
-publicGitOidOldestCommit;
-publicuintMinLine;
-publicuintMaxLine;
+publicUInt16min_match_characters;
+publicgit_oidnewest_commit;
+publicgit_oidoldest_commit;
+publicuintmin_line;
+publicuintmax_line;
 }
 
 [StructLayout(LayoutKind.Sequential)]
-internalunsafeclassGitBlameHunk
+internalunsafestructgit_blame_hunk
 {
-publicushortLinesInHunk;
+publicushortlines_in_hunk;
 
-publicGitOidFinalCommitId;
-publicushortFinalStartLineNumber;
-publicgit_signature*FinalSignature;
+publicgit_oidfinal_commit_id;
+publicushortfinal_start_line_number;
+publicgit_signature*final_signature;
 
-publicGitOidOrigCommitId;
-publicIntPtrOrigPath;
-publicushortOrigStartLineNumber;
-publicgit_signature*OrigSignature;
+publicgit_oidorig_commit_id;
+publicchar*orig_path;
+publicushortorig_start_line_number;
+publicgit_signature*orig_signature;
 
-publicbyteBoundary;
+publicbyteboundary;
 }
 
 internalstaticclassBlameStrategyExtensions

LibGit2Sharp/Core/GitCertificate.cs

@@ -3,7 +3,7 @@
 namespaceLibGit2Sharp.Core
 {
 [StructLayout(LayoutKind.Sequential)]
-internalstructGitCertificate
+internalstructgit_certificate
 {
 publicGitCertificateTypetype;
 }

LibGit2Sharp/Core/GitCertificateSsh.cs

@@ -3,21 +3,19 @@
 namespaceLibGit2Sharp.Core
 {
 [StructLayout(LayoutKind.Sequential)]
-internalstructGitCertificateSsh
+internalunsafestructgit_certificate_ssh
 {
 publicGitCertificateTypecert_type;
 publicGitCertificateSshTypetype;
 
 /// <summary>
 /// The MD5 hash (if appropriate)
 /// </summary>
-[MarshalAs(UnmanagedType.ByValArray,SizeConst=16)]
-publicbyte[]HashMD5;
+publicunsafefixedbyteHashMD5[16];
 
 /// <summary>
 /// The MD5 hash (if appropriate)
 /// </summary>
-[MarshalAs(UnmanagedType.ByValArray,SizeConst=20)]
-publicbyte[]HashSHA1;
+publicunsafefixedbyteHashSHA1[20];
 }
 }

LibGit2Sharp/Core/GitCertificateX509.cs

@@ -4,7 +4,7 @@
 namespaceLibGit2Sharp.Core
 {
 [StructLayout(LayoutKind.Sequential)]
-internalstructGitCertificateX509
+internalunsafestructgit_certificate_x509
 {
 /// <summary>
 /// Type of the certificate, in this case, GitCertificateType.X509
@@ -13,7 +13,7 @@ internal struct GitCertificateX509
 /// <summary>
 /// Pointer to the X509 certificate data
 /// </summary>
-publicIntPtrdata;
+publicbyte*data;
 /// <summary>
 /// The size of the certificate data
 /// </summary>

LibGit2Sharp/Core/GitFilter.cs

@@ -110,12 +110,12 @@ public delegate int git_filter_stream_fn(
 /// The file source being filtered
 /// </summary>
 [StructLayout(LayoutKind.Sequential)]
-internalclassGitFilterSource
+internalunsafestructgit_filter_source
 {
-publicIntPtrrepository;
+publicgit_repository*repository;
 
-publicIntPtrpath;
+publicchar*path;
 
-publicGitOidoid;
+publicgit_oidoid;
 }
 }

LibGit2Sharp/Core/GitPushUpdate.cs

@@ -4,11 +4,11 @@
 namespaceLibGit2Sharp.Core
 {
 [StructLayout(LayoutKind.Sequential)]
-internalstructGitPushUpdate
+internalunsafestructgit_push_update
 {
-publicIntPtrsrc_refname;
-publicIntPtrdst_refname;
-publicGitOidsrc;
-publicGitOiddst;
+publicchar*src_refname;
+publicchar*dst_refname;
+publicgit_oidsrc;
+publicgit_oiddst;
 }
 }