Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark various internal functions as unsafe #254

Merged
merged 1 commit into from
Jan 30, 2024
Merged

Mark various internal functions as unsafe #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hdf5-sys/src/h5.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ extern "C" {
}

#[cfg(feature = "1.14.0")]
type H5_atclose_func_t = Option<extern "C" fn(ctx: *mut c_void)>;
type H5_atclose_func_t = Option<unsafe extern "C" fn(ctx: *mut c_void)>;

#[cfg(feature = "1.14.0")]
extern "C" {
Expand Down
4 changes: 2 additions & 2 deletions hdf5-sys/src/h5a.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ impl Default for H5A_info_t {

#[deprecated(note = "deprecated in HDF5 1.8.0, use H5A_operator2_t")]
pub type H5A_operator1_t = Option<
extern "C" fn(
unsafe extern "C" fn(
location_id: hid_t,
attr_name: *const c_char,
operator_data: *mut c_void,
) -> herr_t,
>;

pub type H5A_operator2_t = Option<
extern "C" fn(
unsafe extern "C" fn(
location_id: hid_t,
attr_name: *const c_char,
ainfo: *const H5A_info_t,
Expand Down
8 changes: 4 additions & 4 deletions hdf5-sys/src/h5d.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ pub enum H5D_mpio_no_collective_cause_t {
}

pub type H5D_operator_t = Option<
extern "C" fn(
unsafe extern "C" fn(
elem: *mut c_void,
type_id: hid_t,
ndim: c_uint,
Expand All @@ -136,15 +136,15 @@ pub type H5D_operator_t = Option<

#[cfg(feature = "1.8.11")]
pub type H5D_scatter_func_t = Option<
extern "C" fn(
unsafe extern "C" fn(
src_buf: *mut *const c_void,
src_buf_bytes_used: *mut size_t,
op_data: *mut c_void,
) -> herr_t,
>;
#[cfg(feature = "1.8.11")]
pub type H5D_gather_func_t = Option<
extern "C" fn(
unsafe extern "C" fn(
dst_buf: *const c_void,
dst_buf_bytes_used: size_t,
op_data: *mut c_void,
Expand Down Expand Up @@ -289,7 +289,7 @@ extern "C" {

#[cfg(feature = "1.14.0")]
pub type H5D_chunk_iter_op_t = Option<
extern "C" fn(
unsafe extern "C" fn(
offset: *const hsize_t,
filter_mask: c_uint,
addr: haddr_t,
Expand Down
4 changes: 2 additions & 2 deletions hdf5-sys/src/h5es.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub enum H5ES_status_t {
}

pub type H5ES_event_complete_func_t = Option<
extern "C" fn(
unsafe extern "C" fn(
op_info: *mut H5ES_op_info_t,
status: H5ES_status_t,
err_stack: hid_t,
Expand All @@ -54,7 +54,7 @@ pub type H5ES_event_complete_func_t = Option<
>;

pub type H5ES_event_insert_func_t =
Option<extern "C" fn(op_info: *const H5ES_op_info_t, ctx: *mut c_void) -> c_int>;
Option<unsafe extern "C" fn(op_info: *const H5ES_op_info_t, ctx: *mut c_void) -> c_int>;

extern "C" {
pub fn H5ESinsert_request(es_id: hid_t, connector_id: hid_t, request: *mut c_void) -> herr_t;
Expand Down
51 changes: 27 additions & 24 deletions hdf5-sys/src/h5fd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,31 +132,33 @@ pub struct H5FD_class_t {
pub fc_degree: H5F_close_degree_t,
#[cfg(feature = "1.14.0")]
pub terminate: Option<extern "C" fn() -> herr_t>,
pub sb_size: Option<extern "C" fn(file: *mut H5FD_t) -> hsize_t>,
pub sb_encode:
Option<extern "C" fn(file: *mut H5FD_t, name: *mut c_char, p: *mut c_uchar) -> herr_t>,
pub sb_decode:
Option<extern "C" fn(f: *mut H5FD_t, name: *const c_char, p: *const c_uchar) -> herr_t>,
pub sb_size: Option<unsafe extern "C" fn(file: *mut H5FD_t) -> hsize_t>,
pub sb_encode: Option<
unsafe extern "C" fn(file: *mut H5FD_t, name: *mut c_char, p: *mut c_uchar) -> herr_t,
>,
pub sb_decode: Option<
unsafe extern "C" fn(f: *mut H5FD_t, name: *const c_char, p: *const c_uchar) -> herr_t,
>,
pub fapl_size: size_t,
pub fapl_get: Option<extern "C" fn(file: *mut H5FD_t) -> *mut c_void>,
pub fapl_copy: Option<extern "C" fn(fapl: *const c_void) -> *mut c_void>,
pub fapl_free: Option<extern "C" fn(fapl: *mut c_void) -> herr_t>,
pub fapl_get: Option<unsafe extern "C" fn(file: *mut H5FD_t) -> *mut c_void>,
pub fapl_copy: Option<unsafe extern "C" fn(fapl: *const c_void) -> *mut c_void>,
pub fapl_free: Option<unsafe extern "C" fn(fapl: *mut c_void) -> herr_t>,
pub dxpl_size: size_t,
pub dxpl_copy: Option<extern "C" fn(dxpl: *const c_void) -> *mut c_void>,
pub dxpl_free: Option<extern "C" fn(dxpl: *mut c_void) -> herr_t>,
pub dxpl_copy: Option<unsafe extern "C" fn(dxpl: *const c_void) -> *mut c_void>,
pub dxpl_free: Option<unsafe extern "C" fn(dxpl: *mut c_void) -> herr_t>,
pub open: Option<
extern "C" fn(
unsafe extern "C" fn(
name: *const c_char,
flags: c_uint,
fapl: hid_t,
maxaddr: haddr_t,
) -> *mut H5FD_t,
>,
pub close: Option<extern "C" fn(file: *mut H5FD_t) -> herr_t>,
pub cmp: Option<extern "C" fn(f1: *const H5FD_t, f2: *const H5FD_t) -> c_int>,
pub query: Option<extern "C" fn(f1: *const H5FD_t, flags: *mut c_ulong) -> herr_t>,
pub close: Option<unsafe extern "C" fn(file: *mut H5FD_t) -> herr_t>,
pub cmp: Option<unsafe extern "C" fn(f1: *const H5FD_t, f2: *const H5FD_t) -> c_int>,
pub query: Option<unsafe extern "C" fn(f1: *const H5FD_t, flags: *mut c_ulong) -> herr_t>,
pub get_type_map:
Option<extern "C" fn(file: *const H5FD_t, type_map: *mut H5FD_mem_t) -> herr_t>,
Option<unsafe extern "C" fn(file: *const H5FD_t, type_map: *mut H5FD_mem_t) -> herr_t>,
pub alloc: Option<
extern "C" fn(
file: *mut H5FD_t,
Expand All @@ -174,10 +176,10 @@ pub struct H5FD_class_t {
size: hsize_t,
) -> herr_t,
>,
pub get_eoa: Option<extern "C" fn(file: *const H5FD_t, type_: H5FD_mem_t) -> haddr_t>,
pub get_eoa: Option<unsafe extern "C" fn(file: *const H5FD_t, type_: H5FD_mem_t) -> haddr_t>,
pub set_eoa:
Option<extern "C" fn(file: *mut H5FD_t, type_: H5FD_mem_t, addr: haddr_t) -> herr_t>,
pub get_eof: Option<extern "C" fn(file: *const H5FD_t) -> haddr_t>,
Option<unsafe extern "C" fn(file: *mut H5FD_t, type_: H5FD_mem_t, addr: haddr_t) -> herr_t>,
pub get_eof: Option<unsafe extern "C" fn(file: *const H5FD_t) -> haddr_t>,
pub get_handle: Option<
extern "C" fn(file: *mut H5FD_t, fapl: hid_t, file_handle: *mut *mut c_void) -> herr_t,
>,
Expand All @@ -201,9 +203,10 @@ pub struct H5FD_class_t {
buffer: *const c_void,
) -> herr_t,
>,
pub flush: Option<extern "C" fn(file: *mut H5FD_t, dxpl_id: hid_t, closing: c_uint) -> herr_t>,
pub flush:
Option<unsafe extern "C" fn(file: *mut H5FD_t, dxpl_id: hid_t, closing: c_uint) -> herr_t>,
pub truncate:
Option<extern "C" fn(file: *mut H5FD_t, dxpl_id: hid_t, closing: hbool_t) -> herr_t>,
Option<unsafe extern "C" fn(file: *mut H5FD_t, dxpl_id: hid_t, closing: hbool_t) -> herr_t>,
pub lock: Option<
extern "C" fn(
file: *mut H5FD_t,
Expand All @@ -213,9 +216,9 @@ pub struct H5FD_class_t {
) -> herr_t,
>,
pub unlock:
Option<extern "C" fn(file: *mut H5FD_t, oid: *mut c_uchar, last: hbool_t) -> herr_t>,
Option<unsafe extern "C" fn(file: *mut H5FD_t, oid: *mut c_uchar, last: hbool_t) -> herr_t>,
#[cfg(feature = "1.14.0")]
pub del: Option<extern "C" fn(name: *const c_char, fapl: hid_t) -> herr_t>,
pub del: Option<unsafe extern "C" fn(name: *const c_char, fapl: hid_t) -> herr_t>,
#[cfg(feature = "1.14.0")]
pub ctl: Option<
extern "C" fn(
Expand Down Expand Up @@ -316,8 +319,8 @@ pub struct H5FD_file_image_callbacks_t {
udata: *mut c_void,
) -> herr_t,
>,
pub udata_copy: Option<extern "C" fn(udata: *mut c_void) -> *mut c_void>,
pub udata_free: Option<extern "C" fn(udata: *mut c_void) -> herr_t>,
pub udata_copy: Option<unsafe extern "C" fn(udata: *mut c_void) -> *mut c_void>,
pub udata_free: Option<unsafe extern "C" fn(udata: *mut c_void) -> herr_t>,
pub udata: *mut c_void,
}

Expand Down
16 changes: 9 additions & 7 deletions hdf5-sys/src/h5i.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ pub type hid_t = c_int;
pub const H5I_INVALID_HID: hid_t = -1;

#[cfg(not(feature = "1.14.0"))]
pub type H5I_free_t = Option<extern "C" fn(arg1: *mut c_void) -> herr_t>;
pub type H5I_free_t = Option<unsafe extern "C" fn(arg1: *mut c_void) -> herr_t>;
#[cfg(feature = "1.14.0")]
pub type H5I_free_t = Option<extern "C" fn(*mut c_void, *mut *mut c_void) -> herr_t>;
pub type H5I_free_t = Option<unsafe extern "C" fn(*mut c_void, *mut *mut c_void) -> herr_t>;

pub type H5I_search_func_t =
Option<extern "C" fn(obj: *mut c_void, id: hid_t, key: *mut c_void) -> c_int>;
Option<unsafe extern "C" fn(obj: *mut c_void, id: hid_t, key: *mut c_void) -> c_int>;
#[cfg(feature = "1.12.0")]
pub type H5I_iterate_func_t = Option<extern "C" fn(id: hid_t, udata: *mut c_void) -> herr_t>;
pub type H5I_iterate_func_t = Option<unsafe extern "C" fn(id: hid_t, udata: *mut c_void) -> herr_t>;

extern "C" {
pub fn H5Iregister(type_: H5I_type_t, object: *const c_void) -> hid_t;
Expand Down Expand Up @@ -79,11 +79,13 @@ extern "C" {
}

#[cfg(feature = "1.14.0")]
pub type H5I_future_realize_func_t =
Option<extern "C" fn(future_object: *mut c_void, actual_object_id: *mut hid_t) -> herr_t>;
pub type H5I_future_realize_func_t = Option<
unsafe extern "C" fn(future_object: *mut c_void, actual_object_id: *mut hid_t) -> herr_t,
>;

#[cfg(feature = "1.14.0")]
pub type H5I_future_discard_func_t = Option<extern "C" fn(future_object: *mut c_void) -> herr_t>;
pub type H5I_future_discard_func_t =
Option<unsafe extern "C" fn(future_object: *mut c_void) -> herr_t>;

#[cfg(feature = "1.14.0")]
extern "C" {
Expand Down
4 changes: 2 additions & 2 deletions hdf5-sys/src/h5l.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ impl Default for H5L_class_t {
}

pub type H5L_iterate1_t = Option<
extern "C" fn(
unsafe extern "C" fn(
group: hid_t,
name: *const c_char,
info: *const H5L_info1_t,
Expand All @@ -178,7 +178,7 @@ pub type H5L_iterate1_t = Option<
>;
#[cfg(feature = "1.12.0")]
pub type H5L_iterate2_t = Option<
extern "C" fn(
unsafe extern "C" fn(
group: hid_t,
name: *const c_char,
info: *const H5L_info2_t,
Expand Down
4 changes: 2 additions & 2 deletions hdf5-sys/src/h5mm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
use crate::internal_prelude::*;

pub type H5MM_allocate_t =
Option<extern "C" fn(size: size_t, alloc_info: *mut c_void) -> *mut c_void>;
pub type H5MM_free_t = Option<extern "C" fn(mem: *mut c_void, free_info: *mut c_void)>;
Option<unsafe extern "C" fn(size: size_t, alloc_info: *mut c_void) -> *mut c_void>;
pub type H5MM_free_t = Option<unsafe extern "C" fn(mem: *mut c_void, free_info: *mut c_void)>;
2 changes: 1 addition & 1 deletion hdf5-sys/src/h5o.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ pub enum H5O_mcdt_search_ret_t {

#[cfg(feature = "1.8.9")]
pub type H5O_mcdt_search_cb_t =
Option<extern "C" fn(op_data: *mut c_void) -> H5O_mcdt_search_ret_t>;
Option<unsafe extern "C" fn(op_data: *mut c_void) -> H5O_mcdt_search_ret_t>;

#[cfg(not(feature = "1.10.3"))]
extern "C" {
Expand Down
18 changes: 10 additions & 8 deletions hdf5-sys/src/h5p.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@ pub const H5P_CRT_ORDER_INDEXED: c_uint = 0x0002;
pub const H5P_DEFAULT: hid_t = 0;

pub type H5P_cls_create_func_t =
Option<extern "C" fn(prop_id: hid_t, create_data: *mut c_void) -> herr_t>;
pub type H5P_cls_copy_func_t =
Option<extern "C" fn(new_prop_id: hid_t, old_prop_id: hid_t, copy_data: *mut c_void) -> herr_t>;
Option<unsafe extern "C" fn(prop_id: hid_t, create_data: *mut c_void) -> herr_t>;
pub type H5P_cls_copy_func_t = Option<
unsafe extern "C" fn(new_prop_id: hid_t, old_prop_id: hid_t, copy_data: *mut c_void) -> herr_t,
>;
pub type H5P_cls_close_func_t =
Option<extern "C" fn(prop_id: hid_t, close_data: *mut c_void) -> herr_t>;
Option<unsafe extern "C" fn(prop_id: hid_t, close_data: *mut c_void) -> herr_t>;
pub type H5P_prp_cb1_t =
Option<extern "C" fn(name: *const c_char, size: size_t, value: *mut c_void) -> herr_t>;
Option<unsafe extern "C" fn(name: *const c_char, size: size_t, value: *mut c_void) -> herr_t>;
pub type H5P_prp_cb2_t = Option<
extern "C" fn(prop_id: hid_t, name: *const c_char, size: size_t, value: *mut c_void) -> herr_t,
>;
Expand All @@ -41,11 +42,12 @@ pub type H5P_prp_set_func_t = H5P_prp_cb2_t;
pub type H5P_prp_get_func_t = H5P_prp_cb2_t;
pub type H5P_prp_delete_func_t = H5P_prp_cb2_t;
pub type H5P_prp_copy_func_t = H5P_prp_cb1_t;
pub type H5P_prp_compare_func_t =
Option<extern "C" fn(value1: *const c_void, value2: *const c_void, size: size_t) -> c_int>;
pub type H5P_prp_compare_func_t = Option<
unsafe extern "C" fn(value1: *const c_void, value2: *const c_void, size: size_t) -> c_int,
>;
pub type H5P_prp_close_func_t = H5P_prp_cb1_t;
pub type H5P_iterate_t =
Option<extern "C" fn(id: hid_t, name: *const c_char, iter_data: *mut c_void) -> herr_t>;
Option<unsafe extern "C" fn(id: hid_t, name: *const c_char, iter_data: *mut c_void) -> herr_t>;

pub use self::globals::*;

Expand Down
39 changes: 22 additions & 17 deletions hdf5-sys/src/h5vl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,34 +131,36 @@ mod v1_14_0 {
#[derive(Debug, Copy, Clone)]
pub struct H5VL_info_class_t {
pub size: size_t,
pub copy: Option<extern "C" fn(info: *const c_void) -> *mut c_void>,
pub copy: Option<unsafe extern "C" fn(info: *const c_void) -> *mut c_void>,
pub cmp: Option<
extern "C" fn(
cmp_value: *mut c_int,
info1: *const c_void,
info2: *const c_void,
) -> herr_t,
>,
pub free: Option<extern "C" fn(info: *mut c_void) -> herr_t>,
pub to_str: Option<extern "C" fn(info: *const c_void, str: *mut *mut c_char) -> herr_t>,
pub from_str: Option<extern "C" fn(str: *const c_char, info: *mut *mut c_void) -> herr_t>,
pub free: Option<unsafe extern "C" fn(info: *mut c_void) -> herr_t>,
pub to_str:
Option<unsafe extern "C" fn(info: *const c_void, str: *mut *mut c_char) -> herr_t>,
pub from_str:
Option<unsafe extern "C" fn(str: *const c_char, info: *mut *mut c_void) -> herr_t>,
}

#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct H5VL_wrap_class_t {
pub get_object: Option<extern "C" fn(obj: *const c_void) -> *mut c_void>,
pub get_object: Option<unsafe extern "C" fn(obj: *const c_void) -> *mut c_void>,
pub get_wrap_ctx:
Option<extern "C" fn(obj: *const c_void, wrap_ctx: *mut *mut c_void) -> herr_t>,
Option<unsafe extern "C" fn(obj: *const c_void, wrap_ctx: *mut *mut c_void) -> herr_t>,
pub wrap_object: Option<
extern "C" fn(
obj: *mut c_void,
obj_type: H5I_type_t,
wrap_ctx: *mut c_void,
) -> *mut c_void,
>,
pub unwrap_object: Option<extern "C" fn(obj: *mut c_void) -> *mut c_void>,
pub free_wrap_ctx: Option<extern "C" fn(wrap_ctx: *mut c_void) -> herr_t>,
pub unwrap_object: Option<unsafe extern "C" fn(obj: *mut c_void) -> *mut c_void>,
pub free_wrap_ctx: Option<unsafe extern "C" fn(wrap_ctx: *mut c_void) -> herr_t>,
}

#[repr(C)]
Expand Down Expand Up @@ -762,8 +764,9 @@ mod v1_14_0 {
req: *mut *mut c_void,
) -> herr_t,
>,
pub close:
Option<extern "C" fn(dt: *mut c_void, dxpl_id: hid_t, req: *mut *mut c_void) -> herr_t>,
pub close: Option<
unsafe extern "C" fn(dt: *mut c_void, dxpl_id: hid_t, req: *mut *mut c_void) -> herr_t,
>,
}

#[repr(C)]
Expand Down Expand Up @@ -1602,7 +1605,7 @@ mod v1_14_0 {
) -> herr_t,
>,
pub get_cap_flags:
Option<extern "C" fn(info: *const c_void, cap_flags: *mut c_uint) -> herr_t>,
Option<unsafe extern "C" fn(info: *const c_void, cap_flags: *mut c_uint) -> herr_t>,
pub opt_query: Option<
extern "C" fn(
obj: *mut c_void,
Expand Down Expand Up @@ -1668,7 +1671,7 @@ mod v1_14_0 {
);

pub type H5VL_request_notify_t =
Option<extern "C" fn(ctx: *mut c_void, status: H5VL_request_status_t) -> herr_t>;
Option<unsafe extern "C" fn(ctx: *mut c_void, status: H5VL_request_status_t) -> herr_t>;

#[repr(C)]
#[derive(Debug, Copy, Clone)]
Expand All @@ -1683,14 +1686,16 @@ mod v1_14_0 {
pub notify: Option<
extern "C" fn(req: *mut c_void, cb: H5VL_request_notify_t, ctx: *mut c_void) -> herr_t,
>,
pub cancel:
Option<extern "C" fn(req: *mut c_void, status: *mut H5VL_request_status_t) -> herr_t>,
pub cancel: Option<
unsafe extern "C" fn(req: *mut c_void, status: *mut H5VL_request_status_t) -> herr_t,
>,
pub specific: Option<
extern "C" fn(req: *mut c_void, args: *mut H5VL_request_specific_args_t) -> herr_t,
>,
pub optional:
Option<extern "C" fn(req: *mut c_void, args: *mut H5VL_optional_args_t) -> herr_t>,
pub free: Option<extern "C" fn(req: *mut c_void) -> herr_t>,
pub optional: Option<
unsafe extern "C" fn(req: *mut c_void, args: *mut H5VL_optional_args_t) -> herr_t,
>,
pub free: Option<unsafe extern "C" fn(req: *mut c_void) -> herr_t>,
}

#[repr(C)]
Expand Down
2 changes: 1 addition & 1 deletion hdf5-sys/src/h5z.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ pub type H5Z_can_apply_func_t =
pub type H5Z_set_local_func_t =
Option<extern "C" fn(dcpl_id: hid_t, type_id: hid_t, space_id: hid_t) -> herr_t>;
pub type H5Z_func_t = Option<
extern "C" fn(
unsafe extern "C" fn(
flags: c_uint,
cd_nelmts: size_t,
cd_values: *const c_uint,
Expand Down
Loading