From b949574af58cbe736efd95fac09795b3af058245 Mon Sep 17 00:00:00 2001 From: Lion Date: Fri, 1 Jul 2022 15:42:39 +0800 Subject: [PATCH] void * for all the close functions --- binding/c/xdb_searcher.c | 12 ++++++++---- binding/c/xdb_searcher.h | 8 ++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/binding/c/xdb_searcher.c b/binding/c/xdb_searcher.c index efc8edc..6f8b0d2 100644 --- a/binding/c/xdb_searcher.c +++ b/binding/c/xdb_searcher.c @@ -47,7 +47,8 @@ XDB_PUBLIC(int) xdb_new_with_buffer(xdb_searcher_t *xdb, const xdb_content_t *c_ return xdb_new_base(xdb, NULL, NULL, c_buffer); } -XDB_PUBLIC(void) xdb_close(xdb_searcher_t *xdb) { +XDB_PUBLIC(void) xdb_close(void *ptr) { + xdb_searcher_t *xdb = (xdb_searcher_t *) ptr; if (xdb->handle != NULL) { fclose(xdb->handle); xdb->handle = NULL; @@ -212,7 +213,8 @@ XDB_PUBLIC(xdb_header_t *) xdb_load_header_from_file(const char *db_path) { return xdb_load_header(handle); } -XDB_PUBLIC(void) xdb_close_header(xdb_header_t *header) { +XDB_PUBLIC(void) xdb_close_header(void *ptr) { + xdb_header_t *header = (xdb_header_t *) ptr; if (header->length > 0) { header->length = 0; xdb_free(header); @@ -254,7 +256,8 @@ XDB_PUBLIC(xdb_vector_index_t *) xdb_load_vector_index_from_file(const char *db_ return xdb_load_vector_index(handle); } -XDB_PUBLIC(void) xdb_close_vector_index(xdb_vector_index_t *v_index) { +XDB_PUBLIC(void) xdb_close_vector_index(void *ptr) { + xdb_vector_index_t *v_index = (xdb_vector_index_t *) ptr; if (v_index->length > 0) { v_index->length = 0; xdb_free(v_index); @@ -310,7 +313,8 @@ XDB_PUBLIC(xdb_content_t *) xdb_load_content_from_file(const char *db_path) { return xdb_load_content(handle); } -XDB_PUBLIC(void) xdb_close_content(xdb_content_t *content) { +XDB_PUBLIC(void) xdb_close_content(void *ptr) { + xdb_content_t *content = (xdb_content_t *) ptr; if (content->length > 0) { content->length = 0; xdb_free(content->buffer); diff --git a/binding/c/xdb_searcher.h b/binding/c/xdb_searcher.h index 5f8427c..12808bc 100644 --- a/binding/c/xdb_searcher.h +++ b/binding/c/xdb_searcher.h @@ -59,7 +59,7 @@ XDB_PUBLIC(xdb_header_t *) xdb_load_header(FILE *); XDB_PUBLIC(xdb_header_t *) xdb_load_header_from_file(const char *); -XDB_PUBLIC(void) xdb_close_header(xdb_header_t *); +XDB_PUBLIC(void) xdb_close_header(void *); // --- vector index buffer @@ -73,7 +73,7 @@ XDB_PUBLIC(xdb_vector_index_t *) xdb_load_vector_index(FILE *); XDB_PUBLIC(xdb_vector_index_t *) xdb_load_vector_index_from_file(const char *); -XDB_PUBLIC(void) xdb_close_vector_index(xdb_vector_index_t *); +XDB_PUBLIC(void) xdb_close_vector_index(void *); // --- content buffer @@ -87,7 +87,7 @@ XDB_PUBLIC(xdb_content_t *) xdb_load_content(FILE *); XDB_PUBLIC(xdb_content_t *) xdb_load_content_from_file(const char *); -XDB_PUBLIC(void) xdb_close_content(xdb_content_t *); +XDB_PUBLIC(void) xdb_close_content(void *); // --- End buffer load @@ -117,7 +117,7 @@ XDB_PUBLIC(int) xdb_new_with_vector_index(xdb_searcher_t *, const char *, const XDB_PUBLIC(int) xdb_new_with_buffer(xdb_searcher_t *, const xdb_content_t *); -XDB_PUBLIC(void) xdb_close(xdb_searcher_t *); +XDB_PUBLIC(void) xdb_close(void *); // xdb searcher search api define XDB_PUBLIC(int) xdb_search_by_string(xdb_searcher_t *, const char *, char *, size_t);