less code dup

Author: molpopgen

src/node_table.rs

@@ -951,22 +951,15 @@ impl OwningNodeTable {
             ),
             None => (std::ptr::null(), 0.into()),
         };
-        let flags: ll_bindings::tsk_flags_t = defaults.flags().bits();
-        let population: ll_bindings::tsk_id_t = defaults.population().into();
-        let individual: ll_bindings::tsk_id_t = defaults.individual().into();
-        let time: f64 = time.into().into();
-        let rv = unsafe {
-            ll_bindings::tsk_node_table_add_row(
-                self.as_mut_ptr(),
-                flags,
-                time,
-                population,
-                individual,
-                ptr,
-                mdlen.into(),
-            )
-        };
-        handle_tsk_return_value!(rv, rv.into())
+        add_row_details(
+            defaults.flags().bits(),
+            time.into().into(),
+            defaults.population().into(),
+            defaults.individual().into(),
+            ptr,
+            mdlen.into(),
+            self.as_mut_ptr(),
+        )
     }
 }
 

src/table_collection.rs

@@ -443,22 +443,15 @@ impl TableCollection {
             ),
             None => (std::ptr::null(), 0.into()),
         };
-        let flags: ll_bindings::tsk_flags_t = defaults.flags().bits();
-        let population: ll_bindings::tsk_id_t = defaults.population().into();
-        let individual: ll_bindings::tsk_id_t = defaults.individual().into();
-        let time: f64 = time.into().into();
-        let rv = unsafe {
-            ll_bindings::tsk_node_table_add_row(
-                &mut (*self.as_mut_ptr()).nodes,
-                flags,
-                time,
-                population,
-                individual,
-                ptr,
-                mdlen.into(),
-            )
-        };
-        handle_tsk_return_value!(rv, rv.into())
+        crate::node_table::add_row_details(
+            defaults.flags().bits(),
+            time.into().into(),
+            defaults.population().into(),
+            defaults.individual().into(),
+            ptr,
+            mdlen.into(),
+            unsafe { &mut (*self.as_mut_ptr()).nodes },
+        )
     }
 
     /// Add a row with optional metadata to the node table