From 3846daf68f8c4a1c2ffe410fd9f4d34197362e74 Mon Sep 17 00:00:00 2001
From: Dominik Loidolt <dominik.loidolt@univie.ac.at>
Date: Mon, 19 Feb 2024 12:48:45 +0100
Subject: [PATCH] Change parameter types in compress_chunk_cmp_size_bound()
---
lib/cmp_chunk.h | 3 ++-
lib/icu_compress/cmp_icu.c | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/cmp_chunk.h b/lib/cmp_chunk.h
index c60fd87..472e8b0 100644
--- a/lib/cmp_chunk.h
+++ b/lib/cmp_chunk.h
@@ -107,7 +107,7 @@ struct cmp_par {
* @returns maximum compressed size for a chunk compression; 0 on error
*/
-uint32_t compress_chunk_cmp_size_bound(void *chunk, uint32_t chunk_size);
+uint32_t compress_chunk_cmp_size_bound(const void *chunk, size_t chunk_size);
/**
@@ -156,6 +156,7 @@ int32_t compress_chunk(void *chunk, uint32_t chunk_size,
uint32_t *dst, uint32_t dst_capacity,
const struct cmp_par *cmp_par);
+
/**
* @brief set the model id and model counter in the compression entity header
*
diff --git a/lib/icu_compress/cmp_icu.c b/lib/icu_compress/cmp_icu.c
index e75ccfa..a51b165 100644
--- a/lib/icu_compress/cmp_icu.c
+++ b/lib/icu_compress/cmp_icu.c
@@ -2714,7 +2714,7 @@ int32_t compress_chunk(void *chunk, uint32_t chunk_size,
* @returns maximum compressed size for a chunk compression; 0 on error
*/
-uint32_t compress_chunk_cmp_size_bound(void *chunk, uint32_t chunk_size)
+uint32_t compress_chunk_cmp_size_bound(const void *chunk, size_t chunk_size)
{
int32_t read_bytes;
uint32_t num_col = 0;
@@ -2726,7 +2726,7 @@ uint32_t compress_chunk_cmp_size_bound(void *chunk, uint32_t chunk_size)
for (read_bytes = 0;
read_bytes < (int32_t)chunk_size-COLLECTION_HDR_SIZE;
- read_bytes += cmp_col_get_size((struct collection_hdr *)((uint8_t *)chunk + read_bytes)))
+ read_bytes += cmp_col_get_size((const struct collection_hdr *)((const uint8_t *)chunk + read_bytes)))
num_col++;
@@ -2735,7 +2735,7 @@ uint32_t compress_chunk_cmp_size_bound(void *chunk, uint32_t chunk_size)
return 0;
}
- return COMPRESS_CHUNK_BOUND(chunk_size, num_col);
+ return COMPRESS_CHUNK_BOUND((uint32_t)chunk_size, num_col);
}
--
GitLab