From a0e3c93b092735dbb3bacb1afd49f3bc3257c0b0 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 15 Dec 2016 15:39:36 -0600 Subject: [PATCH] get rid of FLAG_DEFAULT and juggle some params --- libs/libks/src/include/ks_hash.h | 15 ++++++++------- libs/libks/src/ks_hash.c | 4 ---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/libs/libks/src/include/ks_hash.h b/libs/libks/src/include/ks_hash.h index e651d5e7f1..5651b28efd 100644 --- 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 cdab4d0dfb..db26209419 100644 --- 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; }