From b3474d88f63a09431f7b728b75040544a2fab17b Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 23 Aug 2025 22:46:10 +0100 Subject: [PATCH] Fix lzd exported functions declarations. --- library.h | 123 ++++++++++++++++-------------------------------------- zoo/lzd.c | 10 ++--- 2 files changed, 42 insertions(+), 91 deletions(-) diff --git a/library.h b/library.h index ac444cc..25da777 100644 --- a/library.h +++ b/library.h @@ -54,106 +54,57 @@ #define FORCE_INLINE static inline __attribute__((always_inline)) #endif -AARU_EXPORT int32_t AARU_CALL AARU_adc_decode_buffer(uint8_t * dst_buffer, - int32_t dst_size, - const uint8_t *src_buffer, - int32_t src_size); +AARU_EXPORT int32_t AARU_CALL AARU_adc_decode_buffer(uint8_t *dst_buffer, int32_t dst_size, const uint8_t *src_buffer, + int32_t src_size); -AARU_EXPORT int32_t AARU_CALL AARU_apple_rle_decode_buffer(uint8_t * dst_buffer, - int32_t dst_size, - const uint8_t *src_buffer, - int32_t src_size); +AARU_EXPORT int32_t AARU_CALL AARU_apple_rle_decode_buffer(uint8_t *dst_buffer, int32_t dst_size, + const uint8_t *src_buffer, int32_t src_size); -AARU_EXPORT size_t AARU_CALL AARU_flac_decode_redbook_buffer(uint8_t * dst_buffer, - size_t dst_size, - const uint8_t *src_buffer, - size_t src_size); +AARU_EXPORT size_t AARU_CALL AARU_flac_decode_redbook_buffer(uint8_t *dst_buffer, size_t dst_size, + const uint8_t *src_buffer, size_t src_size); -AARU_EXPORT size_t AARU_CALL AARU_flac_encode_redbook_buffer(uint8_t * dst_buffer, - size_t dst_size, - const uint8_t *src_buffer, - size_t src_size, - uint32_t blocksize, - int32_t do_mid_side_stereo, - int32_t loose_mid_side_stereo, - const char * apodization, - uint32_t max_lpc_order, - uint32_t qlp_coeff_precision, - int32_t do_qlp_coeff_prec_search, - int32_t do_exhaustive_model_search, - uint32_t min_residual_partition_order, - uint32_t max_residual_partition_order, - const char * application_id, - uint32_t application_id_len); +AARU_EXPORT size_t AARU_CALL AARU_flac_encode_redbook_buffer( + uint8_t *dst_buffer, size_t dst_size, const uint8_t *src_buffer, size_t src_size, uint32_t blocksize, + int32_t do_mid_side_stereo, int32_t loose_mid_side_stereo, const char *apodization, uint32_t max_lpc_order, + uint32_t qlp_coeff_precision, int32_t do_qlp_coeff_prec_search, int32_t do_exhaustive_model_search, + uint32_t min_residual_partition_order, uint32_t max_residual_partition_order, const char *application_id, + uint32_t application_id_len); -AARU_EXPORT int32_t AARU_CALL AARU_lzip_decode_buffer(uint8_t * dst_buffer, - int32_t dst_size, - const uint8_t *src_buffer, - int32_t src_size); +AARU_EXPORT int32_t AARU_CALL AARU_lzip_decode_buffer(uint8_t *dst_buffer, int32_t dst_size, const uint8_t *src_buffer, + int32_t src_size); -AARU_EXPORT int32_t AARU_CALL AARU_lzip_encode_buffer(uint8_t * dst_buffer, - int32_t dst_size, - const uint8_t *src_buffer, - int32_t src_size, - int32_t dictionary_size, - int32_t match_len_limit); +AARU_EXPORT int32_t AARU_CALL AARU_lzip_encode_buffer(uint8_t *dst_buffer, int32_t dst_size, const uint8_t *src_buffer, + int32_t src_size, int32_t dictionary_size, + int32_t match_len_limit); -AARU_EXPORT int32_t AARU_CALL AARU_bzip2_decode_buffer(uint8_t * dst_buffer, - uint32_t * dst_size, - const uint8_t *src_buffer, - uint32_t src_size); +AARU_EXPORT int32_t AARU_CALL AARU_bzip2_decode_buffer(uint8_t *dst_buffer, uint32_t *dst_size, + const uint8_t *src_buffer, uint32_t src_size); -AARU_EXPORT int32_t AARU_CALL AARU_bzip2_encode_buffer(uint8_t * dst_buffer, - uint32_t * dst_size, - const uint8_t *src_buffer, - uint32_t src_size, - int32_t blockSize100k); +AARU_EXPORT int32_t AARU_CALL AARU_bzip2_encode_buffer(uint8_t *dst_buffer, uint32_t *dst_size, + const uint8_t *src_buffer, uint32_t src_size, + int32_t blockSize100k); -AARU_EXPORT size_t AARU_CALL AARU_lzfse_decode_buffer(uint8_t * dst_buffer, - size_t dst_size, - const uint8_t *src_buffer, - size_t src_size, - void * scratch_buffer); +AARU_EXPORT size_t AARU_CALL AARU_lzfse_decode_buffer(uint8_t *dst_buffer, size_t dst_size, const uint8_t *src_buffer, + size_t src_size, void *scratch_buffer); -AARU_EXPORT size_t AARU_CALL AARU_lzfse_encode_buffer(uint8_t * dst_buffer, - size_t dst_size, - const uint8_t *src_buffer, - size_t src_size, - void * scratch_buffer); +AARU_EXPORT size_t AARU_CALL AARU_lzfse_encode_buffer(uint8_t *dst_buffer, size_t dst_size, const uint8_t *src_buffer, + size_t src_size, void *scratch_buffer); -AARU_EXPORT int32_t AARU_CALL AARU_lzma_decode_buffer(uint8_t * dst_buffer, - size_t * dst_size, - const uint8_t *src_buffer, - size_t * src_size, - const uint8_t *props, - size_t propsSize); +AARU_EXPORT int32_t AARU_CALL AARU_lzma_decode_buffer(uint8_t *dst_buffer, size_t *dst_size, const uint8_t *src_buffer, + size_t *src_size, const uint8_t *props, size_t propsSize); -AARU_EXPORT int32_t AARU_CALL AARU_lzma_encode_buffer(uint8_t * dst_buffer, - size_t * dst_size, - const uint8_t *src_buffer, - size_t src_size, - uint8_t * outProps, - size_t * outPropsSize, - int32_t level, - uint32_t dictSize, - int32_t lc, - int32_t lp, - int32_t pb, - int32_t fb, - int32_t numThreads); +AARU_EXPORT int32_t AARU_CALL AARU_lzma_encode_buffer(uint8_t *dst_buffer, size_t *dst_size, const uint8_t *src_buffer, + size_t src_size, uint8_t *outProps, size_t *outPropsSize, + int32_t level, uint32_t dictSize, int32_t lc, int32_t lp, + int32_t pb, int32_t fb, int32_t numThreads); -AARU_EXPORT size_t AARU_CALL AARU_zstd_decode_buffer(void * dst_buffer, - size_t dst_size, - const void *src_buffer, - size_t src_size); +AARU_EXPORT size_t AARU_CALL AARU_zstd_decode_buffer(void *dst_buffer, size_t dst_size, const void *src_buffer, + size_t src_size); -AARU_EXPORT size_t AARU_CALL AARU_zstd_encode_buffer(void * dst_buffer, - size_t dst_size, - const void *src_buffer, - size_t src_size, - int32_t compressionLevel); +AARU_EXPORT size_t AARU_CALL AARU_zstd_encode_buffer(void *dst_buffer, size_t dst_size, const void *src_buffer, + size_t src_size, int32_t compressionLevel); -AARU_EXPORT void * AARU_CALL CreateLZDContext(void); +AARU_EXPORT void AARU_CALL *CreateLZDContext(void); AARU_EXPORT void AARU_CALL DestroyLZDContext(void *ctx); diff --git a/zoo/lzd.c b/zoo/lzd.c index dec3e5a..c717c41 100644 --- a/zoo/lzd.c +++ b/zoo/lzd.c @@ -171,7 +171,7 @@ LZDStatus LZD_Drain(LZDContext *ctx, unsigned char *out, size_t out_len, size_t return LZD_OK; } -AARU_EXPORT void LZD_Destroy(LZDContext *ctx) +void LZD_Destroy(LZDContext *ctx) { if(!ctx) return; free(ctx->head); @@ -179,13 +179,13 @@ AARU_EXPORT void LZD_Destroy(LZDContext *ctx) free(ctx->stack); } -AARU_EXPORT void *CreateLZDContext(void) +AARU_EXPORT void AARU_CALL *CreateLZDContext(void) { LZDContext *c = malloc(sizeof *c); return c && LZD_Init(c) == LZD_OK ? c : (free(c), NULL); } -AARU_EXPORT void DestroyLZDContext(void *ctx) +AARU_EXPORT void AARU_CALL DestroyLZDContext(void *ctx) { if(ctx) { @@ -194,12 +194,12 @@ AARU_EXPORT void DestroyLZDContext(void *ctx) } } -AARU_EXPORT int LZD_FeedNative(void *ctx, const unsigned char *data, size_t length) +AARU_EXPORT int AARU_CALL LZD_FeedNative(void *ctx, const unsigned char *data, size_t length) { return (int)LZD_Feed(ctx, data, length); } -AARU_EXPORT int LZD_DrainNative(void *ctx, unsigned char *outBuf, size_t outBufLen, size_t *produced) +AARU_EXPORT int AARU_CALL LZD_DrainNative(void *ctx, unsigned char *outBuf, size_t outBufLen, size_t *produced) { return (int)LZD_Drain(ctx, outBuf, outBufLen, produced); }