Update h5o bindings

Author: mulimoen

hdf5-sys/src/h5o.rs

@@ -126,7 +126,7 @@ impl Default for H5O_hdr_info_t__mesg {
 
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct H5O_info_t {
+pub struct H5O_info1_t {
     pub fileno: c_ulong,
     pub addr: haddr_t,
     pub type_: H5O_type_t,
@@ -137,36 +137,36 @@ pub struct H5O_info_t {
     pub btime: time_t,
     pub num_attrs: hsize_t,
     pub hdr: H5O_hdr_info_t,
-    pub meta_size: H5O_info_t__meta_size,
+    pub meta_size: H5O_info1_t__meta_size,
 }
 
-impl Default for H5O_info_t {
+impl Default for H5O_info1_t {
     fn default() -> Self {
         unsafe { mem::zeroed() }
     }
 }
 
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct H5O_info_t__meta_size {
+pub struct H5O_info1_t__meta_size {
     pub obj: H5_ih_info_t,
     pub attr: H5_ih_info_t,
 }
 
 #[cfg(not(hdf5_1_12_0))]
-impl Default for H5O_info_t__meta_size {
+impl Default for H5O_info1_t__meta_size {
     fn default() -> Self {
         unsafe { mem::zeroed() }
     }
 }
 
 pub type H5O_msg_crt_idx_t = uint32_t;
 
-pub type H5O_iterate_t = Option<
+pub type H5O_iterate1_t = Option<
     extern "C" fn(
         obj: hid_t,
         name: *const c_char,
-        info: *const H5O_info_t,
+        info: *const H5O_info1_t,
         op_data: *mut c_void,
     ) -> herr_t,
 >;
@@ -193,23 +193,41 @@ pub enum H5O_mcdt_search_ret_t {
 pub type H5O_mcdt_search_cb_t =
     Option<extern "C" fn(op_data: *mut c_void) -> H5O_mcdt_search_ret_t>;
 
-#[cfg(not(hdf5_1_10_3))]
 extern "C" {
-    pub fn H5Oget_info(loc_id: hid_t, oinfo: *mut H5O_info_t) -> herr_t;
-    pub fn H5Oget_info_by_name(
-        loc_id: hid_t, name: *const c_char, oinfo: *mut H5O_info_t, lapl_id: hid_t,
+    #[cfg_attr(hdf5_1_10_3, deprecated(note = "deprecated in HDF5 1.10.3, use H5Oget_info2()"))]
+    #[cfg_attr(not(hdf5_1_10_3), link_name = "H5Oget_info")]
+    pub fn H5Oget_info1(loc_id: hid_t, oinfo: *mut H5O_info1_t) -> herr_t;
+    #[cfg_attr(
+        hdf5_1_10_3,
+        deprecated(note = "deprecated in HDF5 1.10.3, use H5Oget_info_by_name2()")
+    )]
+    #[cfg_attr(not(hdf5_1_10_3), link_name = "H5Oget_info_by_name")]
+    pub fn H5Oget_info_by_name1(
+        loc_id: hid_t, name: *const c_char, oinfo: *mut H5O_info1_t, lapl_id: hid_t,
     ) -> herr_t;
-    pub fn H5Oget_info_by_idx(
+    #[cfg_attr(
+        hdf5_1_10_3,
+        deprecated(note = "deprecated in HDF5 1.10.3, use H5Oget_info_by_idx2()")
+    )]
+    #[cfg_attr(not(hdf5_1_10_3), link_name = "H5Oget_info_by_idx")]
+    pub fn H5Oget_info_by_idx1(
         loc_id: hid_t, group_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
-        n: hsize_t, oinfo: *mut H5O_info_t, lapl_id: hid_t,
+        n: hsize_t, oinfo: *mut H5O_info1_t, lapl_id: hid_t,
     ) -> herr_t;
-    pub fn H5Ovisit(
-        obj_id: hid_t, idx_type: H5_index_t, order: H5_iter_order_t, op: H5O_iterate_t,
+    #[cfg_attr(hdf5_1_10_3, deprecated(note = "deprecated in HDF5 1.10.3, use H5Oget_visit2()"))]
+    #[cfg_attr(not(hdf5_1_10_3), link_name = "H5Ovisit")]
+    pub fn H5Ovisit1(
+        obj_id: hid_t, idx_type: H5_index_t, order: H5_iter_order_t, op: H5O_iterate1_t,
         op_data: *mut c_void,
     ) -> herr_t;
-    pub fn H5Ovisit_by_name(
+    #[cfg_attr(
+        hdf5_1_10_3,
+        deprecated(note = "deprecated in HDF5 1.10.3, use H5Ovisit_by_name2()")
+    )]
+    #[cfg_attr(not(hdf5_1_10_3), link_name = "H5Ovisit_by_name")]
+    pub fn H5Ovisit_by_name1(
         loc_id: hid_t, obj_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
-        op: H5O_iterate_t, op_data: *mut c_void, lapl_id: hid_t,
+        op: H5O_iterate1_t, op_data: *mut c_void, lapl_id: hid_t,
     ) -> herr_t;
 }
 
@@ -262,47 +280,26 @@ mod hdf5_1_10_3 {
     use super::*;
 
     extern "C" {
-        pub fn H5Oget_info2(loc_id: hid_t, oinfo: *mut H5O_info_t, fields: c_uint) -> herr_t;
+        pub fn H5Oget_info2(loc_id: hid_t, oinfo: *mut H5O_info1_t, fields: c_uint) -> herr_t;
         pub fn H5Oget_info_by_name2(
-            loc_id: hid_t, name: *const c_char, oinfo: *mut H5O_info_t, fields: c_uint,
+            loc_id: hid_t, name: *const c_char, oinfo: *mut H5O_info1_t, fields: c_uint,
             lapl_id: hid_t,
         ) -> herr_t;
         pub fn H5Oget_info_by_idx2(
             loc_id: hid_t, group_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
-            n: hsize_t, oinfo: *mut H5O_info_t, fields: c_uint, lapl_id: hid_t,
+            n: hsize_t, oinfo: *mut H5O_info1_t, fields: c_uint, lapl_id: hid_t,
         ) -> herr_t;
         pub fn H5Ovisit2(
-            obj_id: hid_t, idx_type: H5_index_t, order: H5_iter_order_t, op: H5O_iterate_t,
+            obj_id: hid_t, idx_type: H5_index_t, order: H5_iter_order_t, op: H5O_iterate1_t,
             op_data: *mut c_void, fields: c_uint,
         ) -> herr_t;
         pub fn H5Ovisit_by_name2(
             loc_id: hid_t, obj_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
-            op: H5O_iterate_t, op_data: *mut c_void, fields: c_uint, lapl_id: hid_t,
-        ) -> herr_t;
-        #[deprecated(note = "deprecated in HDF5 1.10.3, use H5Oget_info2()")]
-        pub fn H5Oget_info1(loc_id: hid_t, oinfo: *mut H5O_info_t) -> herr_t;
-        #[deprecated(note = "deprecated in HDF5 1.10.3, use H5Oget_info_by_name2()")]
-        pub fn H5Oget_info_by_name1(
-            loc_id: hid_t, name: *const c_char, oinfo: *mut H5O_info_t, lapl_id: hid_t,
-        ) -> herr_t;
-        #[deprecated(note = "deprecated in HDF5 1.10.3, use H5Oget_info_by_idx2()")]
-        pub fn H5Oget_info_by_idx1(
-            loc_id: hid_t, group_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
-            n: hsize_t, oinfo: *mut H5O_info_t, lapl_id: hid_t,
-        ) -> herr_t;
-        #[deprecated(note = "deprecated in HDF5 1.10.3, use H5Ovisit2()")]
-        pub fn H5Ovisit1(
-            obj_id: hid_t, idx_type: H5_index_t, order: H5_iter_order_t, op: H5O_iterate_t,
-            op_data: *mut c_void,
-        ) -> herr_t;
-        #[deprecated(note = "deprecated in HDF5 1.10.3, use H5Ovisit_by_name2()")]
-        pub fn H5Ovisit_by_name1(
-            loc_id: hid_t, obj_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
-            op: H5O_iterate_t, op_data: *mut c_void, lapl_id: hid_t,
+            op: H5O_iterate1_t, op_data: *mut c_void, fields: c_uint, lapl_id: hid_t,
         ) -> herr_t;
     }
 
-    #[cfg(not(hdf5_1_10_5))]
+    #[cfg(not(hdf5_1_10_3))]
     pub use self::{
         H5Oget_info1 as H5Oget_info, H5Oget_info_by_idx1 as H5Oget_info_by_idx,
         H5Oget_info_by_name1 as H5Oget_info_by_name, H5Ovisit1 as H5Ovisit,
@@ -319,25 +316,25 @@ extern "C" {
     // in 1.10.5 those APIs were copied over to old names in order to be compatible with
     // older library versions - so we can link to them directly again.
     #[deprecated(note = "deprecated in HDF5 1.10.3, use H5Oget_info2()")]
-    pub fn H5Oget_info(loc_id: hid_t, oinfo: *mut H5O_info_t) -> herr_t;
+    pub fn H5Oget_info(loc_id: hid_t, oinfo: *mut H5O_info1_t) -> herr_t;
     #[deprecated(note = "deprecated in HDF5 1.10.3, use H5Oget_info_by_name2()")]
     pub fn H5Oget_info_by_name(
-        loc_id: hid_t, name: *const c_char, oinfo: *mut H5O_info_t, lapl_id: hid_t,
+        loc_id: hid_t, name: *const c_char, oinfo: *mut H5O_info1_t, lapl_id: hid_t,
     ) -> herr_t;
     #[deprecated(note = "deprecated in HDF5 1.10.3, use H5Oget_info_by_idx2()")]
     pub fn H5Oget_info_by_idx(
         loc_id: hid_t, group_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
-        n: hsize_t, oinfo: *mut H5O_info_t, lapl_id: hid_t,
+        n: hsize_t, oinfo: *mut H5O_info1_t, lapl_id: hid_t,
     ) -> herr_t;
     #[deprecated(note = "deprecated in HDF5 1.10.3, use H5Ovisit2()")]
     pub fn H5Ovisit(
-        obj_id: hid_t, idx_type: H5_index_t, order: H5_iter_order_t, op: H5O_iterate_t,
+        obj_id: hid_t, idx_type: H5_index_t, order: H5_iter_order_t, op: H5O_iterate1_t,
         op_data: *mut c_void,
     ) -> herr_t;
     #[deprecated(note = "deprecated in HDF5 1.10.3, use H5Ovisit_by_name2()")]
     pub fn H5Ovisit_by_name(
         loc_id: hid_t, obj_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
-        op: H5O_iterate_t, op_data: *mut c_void, lapl_id: hid_t,
+        op: H5O_iterate1_t, op_data: *mut c_void, lapl_id: hid_t,
     ) -> herr_t;
 }