From 955658b598fac5236ae9ab8adebbd068205a886e Mon Sep 17 00:00:00 2001 From: Rusty Wagner Date: Mon, 16 Mar 2015 04:01:26 -0400 Subject: Improved graph layout algorithm, add trivial edges until edge routing is written --- binaryninjaapi.h | 2 +- functiongraph.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/binaryninjaapi.h b/binaryninjaapi.h index 4e6c09b3..113ecfc7 100644 --- a/binaryninjaapi.h +++ b/binaryninjaapi.h @@ -781,7 +781,7 @@ namespace BinaryNinja void StartLayout(); bool IsLayoutComplete(); void OnComplete(const std::function& func); - void ClearOnComplete(); + void Abort(); std::vector> GetBlocks() const; diff --git a/functiongraph.cpp b/functiongraph.cpp index 4e48e3cf..1f676618 100644 --- a/functiongraph.cpp +++ b/functiongraph.cpp @@ -13,7 +13,7 @@ FunctionGraph::~FunctionGraph() { // This object is going away, so ensure that any pending completion routines are // no longer called - ClearOnComplete(); + Abort(); BNFreeFunctionGraph(m_graph); } @@ -69,11 +69,11 @@ void FunctionGraph::OnComplete(const std::function& func) } -void FunctionGraph::ClearOnComplete() +void FunctionGraph::Abort() { // Must clear the callback with the core before clearing our own function object, as until it // is cleared in the core it can be called at any time from a different thread. - BNClearFunctionGraphCompleteCallback(m_graph); + BNAbortFunctionGraph(m_graph); m_completeFunc = []() {}; } -- cgit v1.3.1