Commit 6c578b76 authored by antirez's avatar antirez
Browse files

dict.c: added macros to get signed/unsigned integer values from hash

entry. Field name of hash entry union modified for clarity.
parent b28d0461
...@@ -49,7 +49,7 @@ typedef struct dictEntry { ...@@ -49,7 +49,7 @@ typedef struct dictEntry {
union { union {
void *val; void *val;
uint64_t u64; uint64_t u64;
int64_t i64; int64_t s64;
} v; } v;
struct dictEntry *next; struct dictEntry *next;
} dictEntry; } dictEntry;
...@@ -106,7 +106,7 @@ typedef struct dictIterator { ...@@ -106,7 +106,7 @@ typedef struct dictIterator {
} while(0) } while(0)
#define dictSetSignedIntegerVal(d, entry, _val_) \ #define dictSetSignedIntegerVal(d, entry, _val_) \
do { entry->v.i64 = _val_; } while(0) do { entry->v.s64 = _val_; } while(0)
#define dictSetUnsignedIntegerVal(d, entry, _val_) \ #define dictSetUnsignedIntegerVal(d, entry, _val_) \
do { entry->v.u64 = _val_; } while(0) do { entry->v.u64 = _val_; } while(0)
...@@ -130,6 +130,8 @@ typedef struct dictIterator { ...@@ -130,6 +130,8 @@ typedef struct dictIterator {
#define dictHashKey(d, key) (d)->type->hashFunction(key) #define dictHashKey(d, key) (d)->type->hashFunction(key)
#define dictGetKey(he) ((he)->key) #define dictGetKey(he) ((he)->key)
#define dictGetVal(he) ((he)->v.val) #define dictGetVal(he) ((he)->v.val)
#define dictGetSignedIntegerVal ((he)->v.s64)
#define dictGetUnsignedIntegerVal ((he)->v.u64)
#define dictSlots(d) ((d)->ht[0].size+(d)->ht[1].size) #define dictSlots(d) ((d)->ht[0].size+(d)->ht[1].size)
#define dictSize(d) ((d)->ht[0].used+(d)->ht[1].used) #define dictSize(d) ((d)->ht[0].used+(d)->ht[1].used)
#define dictIsRehashing(ht) ((ht)->rehashidx != -1) #define dictIsRehashing(ht) ((ht)->rehashidx != -1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment