Remove ZSTD_XXH64_update

Author: bjorn3

lib/common/xxhash.rs

@@ -1,5 +1,3 @@
-use core::ffi::c_void;
-
 enum Align {
     Aligned,
     Unaligned,
@@ -160,18 +158,6 @@ pub(crate) fn ZSTD_XXH64_reset(state: &mut XXH64_state_t, seed: u64) {
     state.reset(seed)
 }
 
-pub(crate) unsafe fn ZSTD_XXH64_update(
-    state: &mut XXH64_state_t,
-    input: *const c_void,
-    len: usize,
-) {
-    if input.is_null() {
-        assert_eq!(len, 0);
-    } else {
-        ZSTD_XXH64_update_slice(state, core::slice::from_raw_parts(input as *const u8, len));
-    }
-}
-
 pub(crate) fn ZSTD_XXH64_update_slice(state: &mut XXH64_state_t, mut slice: &[u8]) {
     state.total_len = state.total_len.wrapping_add(slice.len() as u64);
 
@@ -259,17 +245,10 @@ mod tests {
     }
 
     fn helper_state_u64(input: &[u8], seed: u64) -> u64 {
-        let mut state = XXH64_state_t {
-            total_len: 0,
-            v: [0; 4],
-            mem64: [0; 4],
-            memsize: 0,
-            reserved32: 0,
-            reserved64: 0,
-        };
+        let mut state = XXH64_state_t::default();
         ZSTD_XXH64_reset(&mut state, seed);
 
-        unsafe { ZSTD_XXH64_update(&mut state, input.as_ptr().cast(), input.len()) };
+        ZSTD_XXH64_update_slice(&mut state, input);
 
         ZSTD_XXH64_digest(&mut state)
     }

lib/compress/zstd_compress.rs

@@ -872,7 +872,7 @@ use crate::lib::common::mem::{
 };
 use crate::lib::common::pool::ZSTD_threadPool;
 use crate::lib::common::xxhash::{
-    XXH64_state_t, ZSTD_XXH64_digest, ZSTD_XXH64_reset, ZSTD_XXH64_update,
+    XXH64_state_t, ZSTD_XXH64_digest, ZSTD_XXH64_reset, ZSTD_XXH64_update_slice,
 };
 use crate::lib::common::zstd_internal::{
     bt_compressed, bt_raw, bt_rle, repStartValue, DefaultMaxOff, LLFSELog, LL_bits, LL_defaultNorm,
@@ -6792,7 +6792,10 @@ unsafe fn ZSTD_compress_frameChunk(
     let maxDist = (1) << (*cctx).appliedParams.cParams.windowLog;
     let mut savings = (*cctx).consumedSrcSize as S64 - (*cctx).producedCSize as S64;
     if (*cctx).appliedParams.fParams.checksumFlag != 0 && srcSize != 0 {
-        ZSTD_XXH64_update(&mut (*cctx).xxhState, src, srcSize);
+        ZSTD_XXH64_update_slice(
+            &mut (*cctx).xxhState,
+            core::slice::from_raw_parts(src as *const u8, srcSize),
+        );
     }
     while remaining != 0 {
         let ms: &mut ZSTD_MatchState_t = &mut (*cctx).blockState.matchState;
@@ -10700,7 +10703,10 @@ pub unsafe extern "C" fn ZSTD_compressSequences(
     dstCapacity = dstCapacity.wrapping_sub(frameHeaderSize);
     cSize = cSize.wrapping_add(frameHeaderSize);
     if (*cctx).appliedParams.fParams.checksumFlag != 0 && srcSize != 0 {
-        ZSTD_XXH64_update(&mut (*cctx).xxhState, src, srcSize);
+        ZSTD_XXH64_update_slice(
+            &mut (*cctx).xxhState,
+            core::slice::from_raw_parts(src as *const u8, srcSize),
+        );
     }
     let cBlocksSize = ZSTD_compressSequences_internal(
         cctx,

lib/compress/zstdmt_compress.rs

@@ -11,7 +11,7 @@ use crate::lib::common::pool::{
     POOL_create_advanced, POOL_free, POOL_resize, POOL_sizeof, POOL_tryAdd, ZSTD_threadPool,
 };
 use crate::lib::common::xxhash::{
-    XXH64_state_t, ZSTD_XXH64_digest, ZSTD_XXH64_reset, ZSTD_XXH64_update,
+    XXH64_state_t, ZSTD_XXH64_digest, ZSTD_XXH64_reset, ZSTD_XXH64_update_slice,
 };
 use crate::lib::compress::zstd_compress::{
     rawSeq, RawSeqStore_t, ZSTD_CCtx, ZSTD_CCtxParams_setParameter, ZSTD_CCtx_params,
@@ -726,7 +726,10 @@ unsafe fn ZSTDMT_serialState_genSequences(
             (*serialState).ldmWindowCond.notify_one();
         }
         if (*serialState).params.fParams.checksumFlag != 0 && src.size > 0 {
-            ZSTD_XXH64_update(&mut (*serialState).xxhState, src.start, src.size);
+            ZSTD_XXH64_update_slice(
+                &mut (*serialState).xxhState,
+                core::slice::from_raw_parts(src.start as *const u8, src.size),
+            );
         }
     }
     (*serialState).nextJobID = ((*serialState).nextJobID).wrapping_add(1);