From d878e8cdf3d6d7c372b1ba1a3a884e9a12425a9b Mon Sep 17 00:00:00 2001 From: Alex Coyte Date: Fri, 4 Aug 2017 11:40:28 +1000 Subject: [PATCH] add dynamic compression to the public api --- src/hs_runtime.h | 19 ++++++++++--------- src/runtime.c | 2 ++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/hs_runtime.h b/src/hs_runtime.h index a93437b8..98e50068 100644 --- a/src/hs_runtime.h +++ b/src/hs_runtime.h @@ -356,8 +356,8 @@ hs_error_t HS_CDECL hs_reset_and_copy_stream(hs_stream_t *to_id, * @ref HS_SUCCESS on success, @ref HS_INSUFFICIENT_SPACE if the provided * buffer is too small. */ -hs_error_t hs_compress_stream(const hs_stream_t *stream, char *buf, - size_t buf_space, size_t *used_space); +hs_error_t HS_CDECL hs_compress_stream(const hs_stream_t *stream, char *buf, + size_t buf_space, size_t *used_space); /** * Decompresses a compressed representation created by @ref hs_compress_stream() @@ -386,8 +386,9 @@ hs_error_t hs_compress_stream(const hs_stream_t *stream, char *buf, * @return * @ref HS_SUCCESS on success, other values on failure. */ -hs_error_t hs_expand_stream(const hs_database_t *db, hs_stream_t **stream, - const char *buf, size_t buf_size); +hs_error_t HS_CDECL hs_expand_stream(const hs_database_t *db, + hs_stream_t **stream, const char *buf, + size_t buf_size); /** * Decompresses a compressed representation created by @ref hs_compress_stream() @@ -428,11 +429,11 @@ hs_error_t hs_expand_stream(const hs_database_t *db, hs_stream_t **stream, * @return * @ref HS_SUCCESS on success, other values on failure. */ -hs_error_t hs_reset_and_expand_stream(hs_stream_t *to_stream, - const char *buf, size_t buf_size, - hs_scratch_t *scratch, - match_event_handler onEvent, - void *context); +hs_error_t HS_CDECL hs_reset_and_expand_stream(hs_stream_t *to_stream, + const char *buf, size_t buf_size, + hs_scratch_t *scratch, + match_event_handler onEvent, + void *context); /** * The block (non-streaming) regular expression scanner. diff --git a/src/runtime.c b/src/runtime.c index 5a8168d3..a374984f 100644 --- a/src/runtime.c +++ b/src/runtime.c @@ -1121,6 +1121,7 @@ hs_error_t hs_compress_stream(const hs_stream_t *stream, char *buf, return HS_SUCCESS; } +HS_PUBLIC_API hs_error_t hs_expand_stream(const hs_database_t *db, hs_stream_t **stream, const char *buf, size_t buf_size) { if (unlikely(!stream || !buf)) { @@ -1159,6 +1160,7 @@ hs_error_t hs_expand_stream(const hs_database_t *db, hs_stream_t **stream, return HS_SUCCESS; } +HS_PUBLIC_API hs_error_t hs_reset_and_expand_stream(hs_stream_t *to_stream, const char *buf, size_t buf_size, hs_scratch_t *scratch,