Skip to content

Commit c0cf249

Browse files
carlosmncarlosmn
committed
Get rid of OidSafeHandle
1 parent 5762938 commit c0cf249

File tree

5 files changed

+43
-63
lines changed

5 files changed

+43
-63
lines changed

‎LibGit2Sharp/Core/Handles/OidSafeHandle.cs‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎LibGit2Sharp/Core/NativeMethods.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,13 @@ internal static extern int git_commit_create_from_ids(
316316
internal static extern string git_commit_message_encoding(GitObjectSafeHandle commit);
317317

318318
[DllImport(libgit2)]
319-
internal static extern OidSafeHandle git_commit_parent_id(GitObjectSafeHandle commit, uint n);
319+
internal static extern unsafe git_oid* git_commit_parent_id(GitObjectSafeHandle commit, uint n);
320320

321321
[DllImport(libgit2)]
322322
internal static extern uint git_commit_parentcount(GitObjectSafeHandle commit);
323323

324324
[DllImport(libgit2)]
325-
internal static extern OidSafeHandle git_commit_tree_id(GitObjectSafeHandle commit);
325+
internal static extern unsafe git_oid* git_commit_tree_id(GitObjectSafeHandle commit);
326326

327327
[DllImport(libgit2)]
328328
internal static extern int git_config_delete_entry(
@@ -767,7 +767,7 @@ internal static extern int git_annotated_commit_lookup(
767767
ref GitOid id);
768768

769769
[DllImport(libgit2)]
770-
internal static extern OidSafeHandle git_annotated_commit_id(
770+
internal static extern unsafe git_oid* git_annotated_commit_id(
771771
GitAnnotatedCommitHandle annotatedCommit);
772772

773773
[DllImport(libgit2)]
@@ -824,7 +824,7 @@ internal static extern int git_note_create(
824824
internal static extern string git_note_message(NoteSafeHandle note);
825825

826826
[DllImport(libgit2)]
827-
internal static extern OidSafeHandle git_note_id(NoteSafeHandle note);
827+
internal static extern unsafe git_oid* git_note_id(NoteSafeHandle note);
828828

829829
[DllImport(libgit2)]
830830
internal static extern int git_note_read(
@@ -899,7 +899,7 @@ internal static extern int git_odb_foreach(
899899
internal static extern void git_odb_stream_free(IntPtr stream);
900900

901901
[DllImport(libgit2)]
902-
internal static extern OidSafeHandle git_object_id(GitObjectSafeHandle obj);
902+
internal static extern unsafe git_oid* git_object_id(GitObjectSafeHandle obj);
903903

904904
[DllImport(libgit2)]
905905
internal static extern int git_object_lookup(out GitObjectSafeHandle obj, RepositorySafeHandle repo, ref GitOid id, GitObjectType type);
@@ -1038,7 +1038,7 @@ internal static extern int git_reference_remove(
10381038
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string name);
10391039

10401040
[DllImport(libgit2)]
1041-
internal static extern unsafe OidSafeHandle git_reference_target(git_reference* reference);
1041+
internal static extern unsafe git_oid* git_reference_target(git_reference* reference);
10421042

10431043
[DllImport(libgit2)]
10441044
internal static extern unsafe int git_reference_rename(
@@ -1094,11 +1094,11 @@ internal static extern ReflogEntrySafeHandle git_reflog_entry_byindex(
10941094
UIntPtr idx);
10951095

10961096
[DllImport(libgit2)]
1097-
internal static extern OidSafeHandle git_reflog_entry_id_old(
1097+
internal static extern unsafe git_oid* git_reflog_entry_id_old(
10981098
SafeHandle entry);
10991099

11001100
[DllImport(libgit2)]
1101-
internal static extern OidSafeHandle git_reflog_entry_id_new(
1101+
internal static extern unsafe git_oid* git_reflog_entry_id_new(
11021102
SafeHandle entry);
11031103

11041104
[DllImport(libgit2)]
@@ -1604,15 +1604,15 @@ internal static extern string git_submodule_url(
16041604
SubmoduleSafeHandle submodule);
16051605

16061606
[DllImport(libgit2)]
1607-
internal static extern OidSafeHandle git_submodule_index_id(
1607+
internal static extern unsafe git_oid* git_submodule_index_id(
16081608
SubmoduleSafeHandle submodule);
16091609

16101610
[DllImport(libgit2)]
1611-
internal static extern OidSafeHandle git_submodule_head_id(
1611+
internal static extern unsafe git_oid* git_submodule_head_id(
16121612
SubmoduleSafeHandle submodule);
16131613

16141614
[DllImport(libgit2)]
1615-
internal static extern OidSafeHandle git_submodule_wd_id(
1615+
internal static extern unsafe git_oid* git_submodule_wd_id(
16161616
SubmoduleSafeHandle submodule);
16171617

16181618
[DllImport(libgit2)]
@@ -1693,7 +1693,7 @@ internal static extern int git_tag_delete(
16931693
internal static extern IntPtr git_tag_tagger(GitObjectSafeHandle tag);
16941694

16951695
[DllImport(libgit2)]
1696-
internal static extern OidSafeHandle git_tag_target_id(GitObjectSafeHandle tag);
1696+
internal static extern unsafe git_oid* git_tag_target_id(GitObjectSafeHandle tag);
16971697

16981698
[DllImport(libgit2)]
16991699
internal static extern GitObjectType git_tag_target_type(GitObjectSafeHandle tag);
@@ -1750,7 +1750,7 @@ internal static extern unsafe int git_tree_entry_bypath(
17501750
internal static extern unsafe void git_tree_entry_free(git_tree_entry* treeEntry);
17511751

17521752
[DllImport(libgit2)]
1753-
internal static extern unsafe OidSafeHandle git_tree_entry_id(git_tree_entry* entry);
1753+
internal static extern unsafe git_oid* git_tree_entry_id(git_tree_entry* entry);
17541754

17551755
[DllImport(libgit2)]
17561756
[return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(LaxUtf8NoCleanupMarshaler))]

‎LibGit2Sharp/Core/Proxy.cs‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,9 @@ public static string git_commit_message_encoding(GitObjectSafeHandle obj)
408408
return NativeMethods.git_commit_message_encoding(obj);
409409
}
410410

411-
public static ObjectId git_commit_parent_id(GitObjectSafeHandle obj, uint i)
411+
public static unsafe ObjectId git_commit_parent_id(GitObjectSafeHandle obj, uint i)
412412
{
413-
return NativeMethods.git_commit_parent_id(obj, i).MarshalAsObjectId();
413+
return ObjectId.BuildFromPtr(NativeMethods.git_commit_parent_id(obj, i));
414414
}
415415

416416
public static int git_commit_parentcount(RepositorySafeHandle repo, ObjectId id)
@@ -426,9 +426,9 @@ public static int git_commit_parentcount(ObjectSafeWrapper obj)
426426
return (int)NativeMethods.git_commit_parentcount(obj.ObjectPtr);
427427
}
428428

429-
public static ObjectId git_commit_tree_id(GitObjectSafeHandle obj)
429+
public static unsafe ObjectId git_commit_tree_id(GitObjectSafeHandle obj)
430430
{
431-
return NativeMethods.git_commit_tree_id(obj).MarshalAsObjectId();
431+
return ObjectId.BuildFromPtr(NativeMethods.git_commit_tree_id(obj));
432432
}
433433

434434
#endregion
@@ -1187,9 +1187,9 @@ public static GitAnnotatedCommitHandle git_annotated_commit_from_revspec(Reposit
11871187
return their_head;
11881188
}
11891189

1190-
public static ObjectId git_annotated_commit_id(GitAnnotatedCommitHandle mergeHead)
1190+
public static unsafe ObjectId git_annotated_commit_id(GitAnnotatedCommitHandle mergeHead)
11911191
{
1192-
return NativeMethods.git_annotated_commit_id(mergeHead).MarshalAsObjectId();
1192+
return ObjectId.BuildFromPtr(NativeMethods.git_annotated_commit_id(mergeHead));
11931193
}
11941194

11951195
public static void git_merge(RepositorySafeHandle repo, GitAnnotatedCommitHandle[] heads, GitMergeOpts mergeOptions, GitCheckoutOpts checkoutOptions)
@@ -1308,9 +1308,9 @@ public static string git_note_message(NoteSafeHandle note)
13081308
return NativeMethods.git_note_message(note);
13091309
}
13101310

1311-
public static ObjectId git_note_id(NoteSafeHandle note)
1311+
public static unsafe ObjectId git_note_id(NoteSafeHandle note)
13121312
{
1313-
return NativeMethods.git_note_id(note).MarshalAsObjectId();
1313+
return ObjectId.BuildFromPtr(NativeMethods.git_note_id(note));
13141314
}
13151315

13161316
public static NoteSafeHandle git_note_read(RepositorySafeHandle repo, string notes_ref, ObjectId id)
@@ -1352,9 +1352,9 @@ public static void git_note_remove(RepositorySafeHandle repo, string notes_ref,
13521352

13531353
#region git_object_
13541354

1355-
public static ObjectId git_object_id(GitObjectSafeHandle obj)
1355+
public static unsafe ObjectId git_object_id(GitObjectSafeHandle obj)
13561356
{
1357-
return NativeMethods.git_object_id(obj).MarshalAsObjectId();
1357+
return ObjectId.BuildFromPtr(NativeMethods.git_object_id(obj));
13581358
}
13591359

13601360
public static void git_object_free(IntPtr obj)
@@ -1883,7 +1883,7 @@ public static void git_reference_remove(RepositorySafeHandle repo, string name)
18831883

18841884
public static unsafe ObjectId git_reference_target(git_reference* reference)
18851885
{
1886-
return NativeMethods.git_reference_target(reference).MarshalAsObjectId();
1886+
return ObjectId.BuildFromPtr(NativeMethods.git_reference_target(reference));
18871887
}
18881888

18891889
public static unsafe ReferenceHandle git_reference_rename(
@@ -1966,14 +1966,14 @@ public static ReflogEntrySafeHandle git_reflog_entry_byindex(ReflogSafeHandle re
19661966
return NativeMethods.git_reflog_entry_byindex(reflog, (UIntPtr)idx);
19671967
}
19681968

1969-
public static ObjectId git_reflog_entry_id_old(SafeHandle entry)
1969+
public static unsafe ObjectId git_reflog_entry_id_old(SafeHandle entry)
19701970
{
1971-
return NativeMethods.git_reflog_entry_id_old(entry).MarshalAsObjectId();
1971+
return ObjectId.BuildFromPtr(NativeMethods.git_reflog_entry_id_old(entry));
19721972
}
19731973

1974-
public static ObjectId git_reflog_entry_id_new(SafeHandle entry)
1974+
public static unsafe ObjectId git_reflog_entry_id_new(SafeHandle entry)
19751975
{
1976-
return NativeMethods.git_reflog_entry_id_new(entry).MarshalAsObjectId();
1976+
return ObjectId.BuildFromPtr(NativeMethods.git_reflog_entry_id_new(entry));
19771977
}
19781978

19791979
public static Signature git_reflog_entry_committer(SafeHandle entry)
@@ -2938,19 +2938,20 @@ public static string git_submodule_url(SubmoduleSafeHandle submodule)
29382938
return NativeMethods.git_submodule_url(submodule);
29392939
}
29402940

2941-
public static ObjectId git_submodule_index_id(SubmoduleSafeHandle submodule)
2941+
public static unsafe ObjectId git_submodule_index_id(SubmoduleSafeHandle submodule)
29422942
{
2943-
return NativeMethods.git_submodule_index_id(submodule).MarshalAsObjectId();
2943+
return ObjectId.BuildFromPtr(NativeMethods.git_submodule_index_id(submodule));
29442944
}
29452945

2946-
public static ObjectId git_submodule_head_id(SubmoduleSafeHandle submodule)
2946+
public static unsafe ObjectId git_submodule_head_id(SubmoduleSafeHandle submodule)
29472947
{
2948-
return NativeMethods.git_submodule_head_id(submodule).MarshalAsObjectId();
2948+
Console.WriteLine("got git_oid for head {0}", NativeMethods.git_submodule_head_id(submodule) == null);
2949+
return ObjectId.BuildFromPtr(NativeMethods.git_submodule_head_id(submodule));
29492950
}
29502951

2951-
public static ObjectId git_submodule_wd_id(SubmoduleSafeHandle submodule)
2952+
public static unsafe ObjectId git_submodule_wd_id(SubmoduleSafeHandle submodule)
29522953
{
2953-
return NativeMethods.git_submodule_wd_id(submodule).MarshalAsObjectId();
2954+
return ObjectId.BuildFromPtr(NativeMethods.git_submodule_wd_id(submodule));
29542955
}
29552956

29562957
public static SubmoduleIgnore git_submodule_ignore(SubmoduleSafeHandle submodule)
@@ -3089,9 +3090,9 @@ public static Signature git_tag_tagger(GitObjectSafeHandle tag)
30893090
return tagger;
30903091
}
30913092

3092-
public static ObjectId git_tag_target_id(GitObjectSafeHandle tag)
3093+
public static unsafe ObjectId git_tag_target_id(GitObjectSafeHandle tag)
30933094
{
3094-
return NativeMethods.git_tag_target_id(tag).MarshalAsObjectId();
3095+
return ObjectId.BuildFromPtr(NativeMethods.git_tag_target_id(tag));
30953096
}
30963097

30973098
public static GitObjectType git_tag_target_type(GitObjectSafeHandle tag)
@@ -3190,7 +3191,7 @@ public static unsafe TreeEntryHandle git_tree_entry_bypath(RepositorySafeHandle
31903191

31913192
public static unsafe ObjectId git_tree_entry_id(git_tree_entry* entry)
31923193
{
3193-
return NativeMethods.git_tree_entry_id(entry).MarshalAsObjectId();
3194+
return ObjectId.BuildFromPtr(NativeMethods.git_tree_entry_id(entry));
31943195
}
31953196

31963197
public static unsafe string git_tree_entry_name(git_tree_entry* entry)

‎LibGit2Sharp/LibGit2Sharp.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@
281281
<Compile Include="Core\Handles\DiffSafeHandle.cs" />
282282
<Compile Include="Core\Handles\GitObjectSafeHandle.cs" />
283283
<Compile Include="Core\Handles\NotOwnedSafeHandleBase.cs" />
284-
<Compile Include="Core\Handles\OidSafeHandle.cs" />
285284
<Compile Include="Core\Handles\TreeBuilderSafeHandle.cs" />
286285
<Compile Include="Core\Handles\SignatureSafeHandle.cs" />
287286
<Compile Include="Core\Handles\TreeEntrySafeHandle.cs" />

‎LibGit2Sharp/ObjectId.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ public ObjectId(byte[] rawId)
5757
Ensure.ArgumentConformsTo(rawId, b => b.Length == rawSize, "rawId");
5858
}
5959

60+
internal static unsafe ObjectId BuildFromPtr(git_oid* id)
61+
{
62+
return id == null ? null : new ObjectId(id->Id);
63+
}
64+
6065
internal unsafe ObjectId(byte* rawId)
6166
{
6267
byte[] id = new byte[GitOid.Size];

0 commit comments

Comments
 (0)