Revert "adt: drop adt_next_property_offset()"

This reverts commit bfe4027.

Signed-off-by: Sasha Finkelstein <[email protected]>

Author: WhatAmISupposedToPutHere

rust/src/adt.rs

@@ -655,6 +655,21 @@ pub unsafe extern "C" fn adt_first_property_offset(_dt: *const c_void, offset: c
     unsafe { p.sub(adt as usize) as c_int }
 }
 
+// This function has load-bearing UB on the C side... The sound Rust equivalent
+// breaks this. Recreate the UB here rather than call the new Rust function.
+#[no_mangle]
+pub unsafe extern "C" fn adt_next_property_offset(_dt: *const c_void, offset: c_int) -> c_int {
+    let ptr: usize = unsafe { adt.add(offset as usize) as usize };
+    let p = ADTProperty::from_ptr(ptr).unwrap();
+    unsafe {
+        p.as_ptr()
+            .add(size_of::<[c_char; 32]>())
+            .add(size_of::<u32>())
+            .add((p.size as usize + (ADT_ALIGN - 1)) & !(ADT_ALIGN - 1))
+            .sub(adt as usize) as c_int
+    }
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn adt_first_child_offset(_dt: *const c_void, offset: c_int) -> c_int {
     let ptr: *const ADTNode = unsafe { adt.add(offset as usize) as *const ADTNode };

src/adt.h

@@ -32,6 +32,8 @@ int adt_get_property_count(const void *adt, int offset);
 
 int adt_first_property_offset(const void *adt, int offset);
 
+int adt_next_property_offset(const void *adt, int offset);
+
 const struct adt_property *adt_get_property_by_offset(const void *adt, int offset);
 
 int adt_get_child_count(const void *adt, int offset);