From 1385e2dbd9be1db21114d95b7c4767773e2b0692 Mon Sep 17 00:00:00 2001
From: Rusty Wagner <rusty@vector35.com>
Date: Mon, 13 Apr 2020 23:23:04 -0400
Subject: Rename linear view disassembly API to use existing option

---
 binaryninjaapi.h            | 2 +-
 binaryninjacore.h           | 2 +-
 linearviewobject.cpp        | 4 ++--
 python/binaryview.py        | 4 ++--
 python/lineardisassembly.py | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index 8bc209aa..9d85f616 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -4989,7 +4989,7 @@ __attribute__ ((format (printf, 1, 2)))
 		uint64_t GetOrderingIndexForChild(LinearViewObject* obj) const;
 		Ref<LinearViewObject> GetChildForOrderingIndex(uint64_t idx);
 
-		static Ref<LinearViewObject> CreateDisassemblyByBlock(BinaryView* view, DisassemblySettings* settings);
+		static Ref<LinearViewObject> CreateDisassembly(BinaryView* view, DisassemblySettings* settings);
 	};
 
 	class LinearViewCursor: public CoreRefCountObject<BNLinearViewCursor,
diff --git a/binaryninjacore.h b/binaryninjacore.h
index a42fd084..49c9e3d5 100644
--- a/binaryninjacore.h
+++ b/binaryninjacore.h
@@ -2971,7 +2971,7 @@ __attribute__ ((format (printf, 1, 2)))
 	BINARYNINJACOREAPI uint64_t BNGetPreviousDataBeforeAddress(BNBinaryView* view, uint64_t addr);
 	BINARYNINJACOREAPI uint64_t BNGetPreviousDataVariableStartBeforeAddress(BNBinaryView* view, uint64_t addr);
 
-	BINARYNINJACOREAPI BNLinearViewObject* BNCreateLinearViewDisassemblyByBlock(BNBinaryView* view,
+	BINARYNINJACOREAPI BNLinearViewObject* BNCreateLinearViewDisassembly(BNBinaryView* view,
 		BNDisassemblySettings* settings);
 	BINARYNINJACOREAPI BNLinearViewObject* BNNewLinearViewObjectReference(BNLinearViewObject* obj);
 	BINARYNINJACOREAPI void BNFreeLinearViewObject(BNLinearViewObject* obj);
diff --git a/linearviewobject.cpp b/linearviewobject.cpp
index 8f4fc22e..3cd8f360 100644
--- a/linearviewobject.cpp
+++ b/linearviewobject.cpp
@@ -199,8 +199,8 @@ Ref<LinearViewObject> LinearViewObject::GetChildForOrderingIndex(uint64_t idx)
 }
 
 
-Ref<LinearViewObject> LinearViewObject::CreateDisassemblyByBlock(BinaryView* view, DisassemblySettings* settings)
+Ref<LinearViewObject> LinearViewObject::CreateDisassembly(BinaryView* view, DisassemblySettings* settings)
 {
-	return new LinearViewObject(BNCreateLinearViewDisassemblyByBlock(view->GetObject(),
+	return new LinearViewObject(BNCreateLinearViewDisassembly(view->GetObject(),
 		settings ? settings->GetObject() : nullptr));
 }
diff --git a/python/binaryview.py b/python/binaryview.py
index 3d2bf78c..6c13f7a9 100644
--- a/python/binaryview.py
+++ b/python/binaryview.py
@@ -4432,7 +4432,7 @@ class BinaryView(object):
 		"""
 		if settings is not None:
 			settings = settings.handle
-		pos = lineardisassembly.LinearViewCursor(lineardisassembly.LinearViewObject.disassembly_by_block(self, settings))
+		pos = lineardisassembly.LinearViewCursor(lineardisassembly.LinearViewObject.disassembly(self, settings))
 		pos.seek_to_address(addr)
 		return pos
 
@@ -4514,7 +4514,7 @@ class BinaryView(object):
 				self._settings = settings
 
 			def __iter__(self):
-				pos = lineardisassembly.LinearViewCursor(lineardisassembly.LinearViewObject.disassembly_by_block(
+				pos = lineardisassembly.LinearViewCursor(lineardisassembly.LinearViewObject.disassembly(
 					self.view, self.settings))
 				while True:
 					lines = self._view.get_next_linear_disassembly_lines(pos, self.settings)
diff --git a/python/lineardisassembly.py b/python/lineardisassembly.py
index 9a94b08b..a23c829f 100644
--- a/python/lineardisassembly.py
+++ b/python/lineardisassembly.py
@@ -253,10 +253,10 @@ class LinearViewObject(object):
 		return core.BNGetLinearViewObjectOrderingIndexForChild(self.handle, child.handle)
 
 	@classmethod
-	def disassembly_by_block(cls, view, settings = None):
+	def disassembly(cls, view, settings = None):
 		if settings is not None:
 			settings = settings.handle
-		return LinearViewObject(core.BNCreateLinearViewDisassemblyByBlock(view.handle, settings))
+		return LinearViewObject(core.BNCreateLinearViewDisassembly(view.handle, settings))
 
 
 class LinearViewCursor(object):
-- 
cgit v1.3.1