get rid of FLAG_DEFAULT and juggle some params

diff --git a/libs/libks/src/include/ks_hash.h b/libs/libks/src/include/ks_hash.h
index e651d5e7f1b4a50db355421c2efe7399ec352d59..5651b28efdca70b61564ec3e6a8dfe8fd089cafe 100644 (file)
--- a/libs/libks/src/include/ks_hash.h
+++ b/libs/libks/src/include/ks_hash.h
@@ -90,16 +90,17 @@ typedef enum {
 
 
 typedef enum {
-       KS_HASH_FLAG_NONE = 0,
-       KS_HASH_FLAG_DEFAULT = (1 << 0),
-       KS_HASH_FLAG_FREE_KEY = (1 << 1),
-       KS_HASH_FLAG_FREE_VALUE = (1 << 2),
-       KS_HASH_FLAG_RWLOCK = (1 << 3),
-       KS_HASH_FLAG_DUP_CHECK = (1 << 4),
-       KS_HASH_FLAG_NOLOCK = (1 << 5)
+       KS_HASH_FLAG_MUTEX = 0,
+       KS_HASH_FLAG_FREE_KEY = (1 << 0),
+       KS_HASH_FLAG_FREE_VALUE = (1 << 1),
+       KS_HASH_FLAG_RWLOCK = (1 << 2),
+       KS_HASH_FLAG_DUP_CHECK = (1 << 3),
+       KS_HASH_FLAG_NOLOCK = (1 << 4)
 } ks_hash_flag_t;
 
 #define KS_HASH_FREE_BOTH KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE
+#define KS_HASH_FLAG_NONE KS_HASH_FLAG_MUTEX
+
 
 typedef enum {
        KS_HASH_MODE_DEFAULT = 0,

diff --git a/libs/libks/src/ks_hash.c b/libs/libks/src/ks_hash.c
index cdab4d0dfb9f7f4fb350cc3d8a53476d8c0f7ff2..db26209419d6518e4700eac2fa5ddf4033809b73 100644 (file)
--- a/libs/libks/src/ks_hash.c
+++ b/libs/libks/src/ks_hash.c
@@ -210,10 +210,6 @@ ks_hash_create_ex(ks_hash_t **hp, unsigned int minsize,
                break;
        }
 
-       if (flags == KS_HASH_FLAG_DEFAULT) {
-               flags = KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_NOLOCK;
-       }
-
        if ((flags & KS_HASH_FLAG_NOLOCK)) {
                flags &= ~KS_HASH_FLAG_RWLOCK;
        }