From 55cf411c056ceb725d8172cc71318d32f5a3b207 Mon Sep 17 00:00:00 2001 From: Peter LaFosse Date: Wed, 11 Aug 2021 08:31:03 -0400 Subject: Move MemberAccess/MemberScope to StructureMember Fix rust AddStructureMemebers --- rust/src/types.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'rust/src') diff --git a/rust/src/types.rs b/rust/src/types.rs index 45ea6d7d..c56611d0 100644 --- a/rust/src/types.rs +++ b/rust/src/types.rs @@ -1203,7 +1203,7 @@ impl ToOwned for Enumeration { ////////////////////// // StructureBuilder -pub type StructureType = BNStructureType; +pub type StructureType = BNStructureVariant; #[derive(PartialEq, Eq, Hash)] pub struct StructureBuilder { @@ -1263,10 +1263,12 @@ impl StructureBuilder { &'a mut self, t: T, name: S, + access: BNMemberAccess, + scope: BNMemberScope, ) -> &'a mut Self { let name = name.as_bytes_with_nul(); unsafe { - BNAddStructureBuilderMember(self.handle, &t.into().into(), name.as_ref().as_ptr() as _); + BNAddStructureBuilderMember(self.handle, &t.into().into(), name.as_ref().as_ptr() as _, access, scope); } self @@ -1278,6 +1280,8 @@ impl StructureBuilder { name: S, offset: u64, overwrite_existing: bool, + access: BNMemberAccess, + scope: BNMemberScope, ) -> &'a mut Self { let name = name.as_bytes_with_nul(); unsafe { @@ -1287,6 +1291,8 @@ impl StructureBuilder { name.as_ref().as_ptr() as _, offset, overwrite_existing, + access, + scope ); } -- cgit v1.3.1