From: antirez <antirez@gmail.com>
Date: Tue, 14 Dec 2010 16:42:01 +0000 (+0100)
Subject: Merge remote branch 'pietern/strrange'
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/57997664eaba82ad263c61b9cdbe7dd26ec8d08d?ds=inline;hp=-c

Merge remote branch 'pietern/strrange'
---

57997664eaba82ad263c61b9cdbe7dd26ec8d08d
diff --combined src/redis.h
index 67b76a47,927a4f1d..6e2112a0
--- a/src/redis.h
+++ b/src/redis.h
@@@ -813,9 -813,8 +813,9 @@@ int setTypeRemove(robj *subject, robj *
  int setTypeIsMember(robj *subject, robj *value);
  setTypeIterator *setTypeInitIterator(robj *subject);
  void setTypeReleaseIterator(setTypeIterator *si);
 -robj *setTypeNext(setTypeIterator *si);
 -int setTypeRandomElement(robj *setobj, robj **objele, long long *llele);
 +int setTypeNext(setTypeIterator *si, robj **objele, int64_t *llele);
 +robj *setTypeNextObject(setTypeIterator *si);
 +int setTypeRandomElement(robj *setobj, robj **objele, int64_t *llele);
  unsigned long setTypeSize(robj *subject);
  void setTypeConvert(robj *subject, int enc);
  
@@@ -823,8 -822,7 +823,8 @@@
  void convertToRealHash(robj *o);
  void hashTypeTryConversion(robj *subject, robj **argv, int start, int end);
  void hashTypeTryObjectEncoding(robj *subject, robj **o1, robj **o2);
 -robj *hashTypeGet(robj *o, robj *key);
 +int hashTypeGet(robj *o, robj *key, robj **objval, unsigned char **v, unsigned int *vlen);
 +robj *hashTypeGetObject(robj *o, robj *key);
  int hashTypeExists(robj *o, robj *key);
  int hashTypeSet(robj *o, robj *key, robj *value);
  int hashTypeDelete(robj *o, robj *key);
@@@ -832,8 -830,7 +832,8 @@@ unsigned long hashTypeLength(robj *o)
  hashTypeIterator *hashTypeInitIterator(robj *subject);
  void hashTypeReleaseIterator(hashTypeIterator *hi);
  int hashTypeNext(hashTypeIterator *hi);
 -robj *hashTypeCurrent(hashTypeIterator *hi, int what);
 +int hashTypeCurrent(hashTypeIterator *hi, int what, robj **objval, unsigned char **v, unsigned int *vlen);
 +robj *hashTypeCurrentObject(hashTypeIterator *hi, int what);
  robj *hashTypeLookupWriteOrCreate(redisClient *c, robj *key);
  
  /* Pub / Sub */
@@@ -890,6 -887,10 +890,10 @@@ void setexCommand(redisClient *c)
  void getCommand(redisClient *c);
  void delCommand(redisClient *c);
  void existsCommand(redisClient *c);
+ void setbitCommand(redisClient *c);
+ void getbitCommand(redisClient *c);
+ void setrangeCommand(redisClient *c);
+ void getrangeCommand(redisClient *c);
  void incrCommand(redisClient *c);
  void decrCommand(redisClient *c);
  void incrbyCommand(redisClient *c);
@@@ -967,7 -968,6 +971,6 @@@ void discardCommand(redisClient *c)
  void blpopCommand(redisClient *c);
  void brpopCommand(redisClient *c);
  void appendCommand(redisClient *c);
- void substrCommand(redisClient *c);
  void strlenCommand(redisClient *c);
  void zrankCommand(redisClient *c);
  void zrevrankCommand(redisClient *c);