From e3c307aa858f8f81d4cb0a5cfe4271cdc5d984be Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期一, 08 二月 2021 10:40:58 +0800 Subject: [PATCH] add remove keys and remove keys exclude --- libcbhomebus.h | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libcbhomebus.h b/libcbhomebus.h index 44f8bb2..da0fd2c 100644 --- a/libcbhomebus.h +++ b/libcbhomebus.h @@ -13,6 +13,8 @@ static tfn_shm_init fn_shm_init = NULL; static tfn_shm_alloc_key fn_shm_alloc_key = NULL; static tfn_shm_destroy fn_shm_destroy = NULL; +static tfn_shm_remove_keys fn_shm_remove_keys = NULL; +static tfn_shm_remove_keys_exclude fn_shm_remove_keys_exclude = NULL; // net mode socket static tfn_net_mod_socket_open fn_socket_open = NULL; @@ -46,8 +48,6 @@ static tfn_net_mod_socket_get_key fn_socket_get_key = NULL; static tfn_net_mod_socket_free_recv_msg_arr fn_socket_free_recv_msg_arr = NULL; static tfn_net_mod_socket_free fn_socket_free = NULL; -static tfn_shm_mod_socket_remove_key fn_socket_remove_key = NULL; -static tfn_shm_mod_socket_remove_keys fn_socket_remove_keys = NULL; static tfn_net_mod_server_socket_open fn_server_socket_open = NULL; static tfn_net_mod_server_socket_close fn_server_socket_close = NULL; @@ -64,6 +64,8 @@ const static char l_shm_init[] = "shm_mm_wrapper_init"; const static char l_shm_destroy[] = "shm_mm_wrapper_destroy"; const static char l_shm_alloc_key[] = "shm_mm_wrapper_alloc_key"; +const static char l_shm_remove_keys[] = "shm_mm_wrapper_remove_keys"; +const static char l_shm_remove_keys_exclude[] = "shm_mm_wrapper_remove_keys_exclude"; // net mode socket const static char l_socket_open[] = "net_mod_socket_open"; @@ -98,8 +100,6 @@ const static char l_net_mod_socket_get_key[] = "net_mod_socket_get_key"; const static char l_net_mod_socket_free_recv_msg_arr[] = "net_mod_socket_free_recv_msg_arr"; const static char l_net_mod_socket_free[] = "net_mod_socket_free"; -const static char l_shm_mod_socket_remove_key[] = "shm_mod_socket_remove_key"; -const static char l_shm_mod_socket_remove_keys[] = "shm_mod_socket_remove_keys"; const static char l_net_mod_server_socket_open[] = "net_mod_server_socket_open"; const static char l_net_mod_server_socket_close[] = "net_mod_server_socket_close"; @@ -120,6 +120,8 @@ void wrap_fn_shm_init(hbhomebus lib, int size); int wrap_fn_shm_alloc_key(hbhomebus lib); void wrap_fn_shm_destroy(hbhomebus lib); +int wrap_fn_shm_remove_keys(hbhomebus lib, void *keys, int length); +int wrap_fn_shm_remove_keys_exclude(hbhomebus lib, void *keys, int length); ///////////////////////////////////////////////////////// // net mode socket @@ -157,9 +159,6 @@ int wrap_fn_socket_get_key(hbhomebus lib, void * _socket) ; void wrap_fn_socket_free_recv_msg_arr(hbhomebus lib, void * arr, int size); void wrap_fn_socket_free(hbhomebus lib, void *buf) ; - -int wrap_fn_socket_remove_key(hbhomebus lib, int key); -int wrap_fn_socket_remove_keys(hbhomebus lib, void *keys, int length); void *wrap_fn_server_socket_open(hbhomebus lib, int port); void wrap_fn_server_socket_close(hbhomebus lib, void* _socket); -- Gitblit v1.8.0