Use the new Allocator API

Author: brianpane

libz-rs-sys/Cargo.toml

@@ -19,7 +19,7 @@ export-symbols = [] # whether the zlib api symbols are publicly exported
 custom-prefix = ["export-symbols"] # use the LIBZ_RS_SYS_PREFIX to prefix all exported symbols
 testing-prefix = ["export-symbols"] # prefix all symbols with LIBZ_RS_SYS_TEST_ for testing
 semver-prefix = ["export-symbols"] # prefix all symbols in a semver-compatible way
-gz = ["dep:libc"] # gzip support has to be configued explicitly, to avoid a libc dependency in the core zlib-rs
+gz = ["dep:libc"] # gzip support has to be configured explicitly, to avoid a libc dependency in the core zlib-rs
 
 [dependencies]
 zlib-rs = { workspace = true, default-features = false }

libz-rs-sys/src/gz.rs

@@ -2,7 +2,6 @@ use zlib_rs::allocate::*;
 pub use zlib_rs::c_api::*;
 
 use core::ffi::{c_char, c_int, c_uint, CStr};
-use core::mem::size_of;
 use core::ptr;
 use libc::{O_APPEND, O_CREAT, O_EXCL, O_RDONLY, O_TRUNC, O_WRONLY, SEEK_CUR, SEEK_END};
 use zlib_rs::deflate::Strategy;
@@ -106,7 +105,7 @@ unsafe fn gzopen_help(path: *const c_char, fd: c_int, mode: *const c_char) -> gz
         return ptr::null_mut();
     }
 
-    let Some(state) = ALLOCATOR.allocate_zeroed(size_of::<GzState>()) else {
+    let Some(state) = ALLOCATOR.allocate_zeroed_raw::<GzState>() else {
         return ptr::null_mut();
     };
     let state = state.cast::<GzState>().as_mut();
@@ -160,7 +159,7 @@ unsafe fn gzopen_help(path: *const c_char, fd: c_int, mode: *const c_char) -> gz
     // Save the path name for error messages
     // FIXME: support Windows wide characters for compatibility with zlib-ng
     let len = libc::strlen(path) + 1;
-    let Some(path_copy) = ALLOCATOR.allocate_zeroed(len) else {
+    let Some(path_copy) = ALLOCATOR.allocate_slice_raw::<u8>(len) else {
         free_state(state);
         return ptr::null_mut();
     };