Merge branch 'ltrim-tests' of git://github.com/pietern/redis

[redis.git] / dict.h

diff --git a/dict.h b/dict.h
index 15dbb37f3e9ec9e8581a7ecea1cb7ebc39401b85..30ace4db7cba3df6bae3ac01d4a55d4f43ecc733 100644 (file)
--- a/dict.h
+++ b/dict.h
@@ -122,24 +122,26 @@ typedef struct dictIterator {
 
 /* API */
 dict *dictCreate(dictType *type, void *privDataPtr);
 
 /* API */
 dict *dictCreate(dictType *type, void *privDataPtr);

-int dictExpand(dict *ht, unsigned long size);
-int dictAdd(dict *ht, void *key, void *val);
-int dictReplace(dict *ht, void *key, void *val);
-int dictDelete(dict *ht, const void *key);
-int dictDeleteNoFree(dict *ht, const void *key);
-void dictRelease(dict *ht);
-dictEntry * dictFind(dict *ht, const void *key);
-int dictResize(dict *ht);
-dictIterator *dictGetIterator(dict *ht);
+int dictExpand(dict *d, unsigned long size);
+int dictAdd(dict *d, void *key, void *val);
+int dictReplace(dict *d, void *key, void *val);
+int dictDelete(dict *d, const void *key);
+int dictDeleteNoFree(dict *d, const void *key);
+void dictRelease(dict *d);
+dictEntry * dictFind(dict *d, const void *key);
+void *dictFetchValue(dict *d, const void *key);
+int dictResize(dict *d);
+dictIterator *dictGetIterator(dict *d);

 dictEntry *dictNext(dictIterator *iter);
 void dictReleaseIterator(dictIterator *iter);
 dictEntry *dictNext(dictIterator *iter);
 void dictReleaseIterator(dictIterator *iter);

-dictEntry *dictGetRandomKey(dict *ht);
-void dictPrintStats(dict *ht);
+dictEntry *dictGetRandomKey(dict *d);
+void dictPrintStats(dict *d);

 unsigned int dictGenHashFunction(const unsigned char *buf, int len);
 unsigned int dictGenHashFunction(const unsigned char *buf, int len);

-void dictEmpty(dict *ht);
+void dictEmpty(dict *d);

 void dictEnableResize(void);
 void dictDisableResize(void);
 int dictRehash(dict *d, int n);
 void dictEnableResize(void);
 void dictDisableResize(void);
 int dictRehash(dict *d, int n);

+int dictRehashMilliseconds(dict *d, int ms);

 
 /* Hash table types */
 extern dictType dictTypeHeapStringCopyKey;
 
 /* Hash table types */
 extern dictType dictTypeHeapStringCopyKey;