From bf95fa0fba9764608aa4164d9ead5839d2edde87 Mon Sep 17 00:00:00 2001 From: Hans Kristian Rosbach Date: Sun, 30 Nov 2025 22:31:49 +0100 Subject: Inline all uses of quick_insert_string*/quick_insert_value*. Inline all uses of update_hash*. Inline insert_string into deflate_quick, deflate_fast and deflate_medium. Remove insert_string from deflate_state Use local function pointer for insert_string. Fix level check to actually check level and not `s->max_chain_length <= 1024`. --- insert_string.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'insert_string.c') diff --git a/insert_string.c b/insert_string.c index 2826921292..dd1960fbe6 100644 --- a/insert_string.c +++ b/insert_string.c @@ -1,4 +1,4 @@ -/* insert_string.c -- insert_string integer hash variant +/* insert_string.c -- make insert_string functions from static inlined functions * * Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h @@ -7,16 +7,12 @@ #include "zbuild.h" #include "deflate.h" +#include "insert_string_p.h" -#define HASH_SLIDE 16 +void insert_string(deflate_state *const s, uint32_t str, uint32_t count) { + insert_string_static(s, str, count); +} -#define HASH_CALC(h, val) h = ((val * 2654435761U) >> HASH_SLIDE); -#define HASH_CALC_VAR h -#define HASH_CALC_VAR_INIT uint32_t h - -#define UPDATE_HASH update_hash -#define INSERT_STRING insert_string -#define QUICK_INSERT_STRING quick_insert_string -#define QUICK_INSERT_VALUE quick_insert_value - -#include "insert_string_tpl.h" +void insert_string_roll(deflate_state *const s, uint32_t str, uint32_t count) { + insert_string_roll_static(s, str, count); +} -- cgit 0.0.5-2-1-g0f52