[libhash] fix return of get_and_del

gozfree · Jan 27, 2023 · 53dee1a · 53dee1a
1 parent 1e8bdfe
commit 53dee1a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/gear-lib/CMakeLists.txt b/gear-lib/CMakeLists.txt
@@ -16,6 +16,8 @@ ENDIF ()
 ENDIF ()
 
 SET(DICT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libdict/)
+SET(STREX_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libstrex/)
+SET(HASH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libhash/)
 SET(DARRAY_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libdarray/)
 SET(THREAD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libthread/)
 SET(GEVENT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libgevent/)
@@ -31,6 +33,7 @@ ADD_SUBDIRECTORY(libposix)
 ADD_SUBDIRECTORY(libstrex)
 ADD_SUBDIRECTORY(libbitmap)
 ADD_SUBDIRECTORY(libdict)
+ADD_SUBDIRECTORY(libhash)
 ADD_SUBDIRECTORY(libdarray)
 IF (NOT DEFINED OS_WINDOWS)
 ADD_SUBDIRECTORY(libqueue)

diff --git a/gear-lib/libhash/CMakeLists.txt b/gear-lib/libhash/CMakeLists.txt
@@ -0,0 +1,7 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
+PROJECT(gear-lib)
+
+INCLUDE_DIRECTORIES(. ${POSIX_INCLUDE_DIR})
+AUX_SOURCE_DIRECTORY(. SOURCE_FILES)
+
+ADD_LIBRARY(hash ${SOURCE_FILES})
diff --git a/gear-lib/libhash/Makefile b/gear-lib/libhash/Makefile
@@ -60,6 +60,7 @@ CFLAGS	+= -I$(OUTPUT)/include/gear-lib
 SHARED	:= -shared
 
 LDFLAGS	:= $($(ARCH)_LDFLAGS)
+LDFLAGS	+= -L$(OUTLIBPATH)/lib/gear-lib -lstrex
 LDFLAGS	+= -pthread
 
 ###############################################################################

diff --git a/gear-lib/libhash/libhash.c b/gear-lib/libhash/libhash.c
@@ -33,7 +33,7 @@
  * [bucket2] -> item[1] -> item[2] -> ... -> item[m2]
  * ...
  * [bucketn] -> item[1] -> item[2] -> ... -> item[mn]
- * 
+ *
  */
 
 #define HASH_MAX_KEY_STRLEN 32
@@ -285,10 +285,11 @@ void *hash_get_and_del(struct hash *h, const char *key)
     uint32_t hash = 0;
     struct hash_item *hi = hash_lookup(h, key, &hash);
     if (hi) {
+        void *val = memdup(hi->val, sizeof(void *));
         hlist_del((struct hlist_node *)hi);
         free(hi->key);
         free(hi);
-        return NULL;
+        return val;
     }
     return NULL;
 }