From 086435bd364505f7e05c8a83e48e8b5bec30c94d Mon Sep 17 00:00:00 2001 From: Josh Ferrell Date: Wed, 15 Feb 2023 17:24:20 -0500 Subject: Remove legacy BNDB Merge Tool --- binaryninjacore.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'binaryninjacore.h') diff --git a/binaryninjacore.h b/binaryninjacore.h index a87a5535..f2cc350e 100644 --- a/binaryninjacore.h +++ b/binaryninjacore.h @@ -2026,26 +2026,12 @@ extern "C" { bool valid; BNUser* user; - char* hash; + char* id; BNUndoAction* actions; uint64_t actionCount; uint64_t timestamp; }; - enum BNMergeStatus - { - NOT_APPLICABLE = 0, - OK = 1, - CONFLICT = 2 - }; - - struct BNMergeResult - { - BNMergeStatus status; - BNUndoAction action; - const char* hash; - }; - struct BNCallingConventionWithConfidence { BNCallingConvention* convention; @@ -3240,9 +3226,6 @@ extern "C" BINARYNINJACOREAPI bool BNCreateSnapshotedViewWithProgress(BNBinaryView* data, const char* viewName, void* ctxt, bool (*progress)(void* ctxt, size_t progress, size_t total)); - BINARYNINJACOREAPI BNMergeResult BNMergeUserAnalysis(BNFileMetadata* file, const char* name, void* ctxt, - bool (*progress)(void* ctxt, size_t progress, size_t total), char** excludedHashes, size_t excludedHashesCount); - BINARYNINJACOREAPI char* BNGetOriginalFilename(BNFileMetadata* file); BINARYNINJACOREAPI void BNSetOriginalFilename(BNFileMetadata* file, const char* name); -- cgit v1.3.1