提交 a0e3c93b authored 作者: Anthony Minessale's avatar Anthony Minessale 提交者: Mike Jerris

get rid of FLAG_DEFAULT and juggle some params

上级 ec0906e2
......@@ -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,
......
......@@ -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;
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论