Commit 5ba49014 authored by Pieter Noordhuis's avatar Pieter Noordhuis
Browse files

Privdata can be set directly on the struct

parent 20022189
...@@ -552,16 +552,6 @@ int redisReplyReaderSetReplyObjectFunctions(redisReader *r, redisReplyObjectFunc ...@@ -552,16 +552,6 @@ int redisReplyReaderSetReplyObjectFunctions(redisReader *r, redisReplyObjectFunc
return REDIS_ERR; return REDIS_ERR;
} }
/* Set the private data field that is used in the read tasks. This argument can
* be used to curry arbitrary data to the custom reply object functions. */
int redisReplyReaderSetPrivdata(redisReader *r, void *privdata) {
if (r->reply == NULL) {
r->privdata = privdata;
return REDIS_OK;
}
return REDIS_ERR;
}
void redisReplyReaderFree(redisReader *r) { void redisReplyReaderFree(redisReader *r) {
if (r->reply != NULL && r->fn && r->fn->freeObject) if (r->reply != NULL && r->fn && r->fn->freeObject)
r->fn->freeObject(r->reply); r->fn->freeObject(r->reply);
......
...@@ -134,14 +134,14 @@ typedef struct redisReader { ...@@ -134,14 +134,14 @@ typedef struct redisReader {
void freeReplyObject(void *reply); void freeReplyObject(void *reply);
redisReader *redisReplyReaderCreate(void); redisReader *redisReplyReaderCreate(void);
int redisReplyReaderSetReplyObjectFunctions(redisReader *r, redisReplyObjectFunctions *fn); int redisReplyReaderSetReplyObjectFunctions(redisReader *r, redisReplyObjectFunctions *fn);
int redisReplyReaderSetPrivdata(redisReader *r, void *privdata);
void redisReplyReaderFree(redisReader *r); void redisReplyReaderFree(redisReader *r);
void redisReplyReaderFeed(redisReader *r, const char *buf, size_t len); void redisReplyReaderFeed(redisReader *r, const char *buf, size_t len);
int redisReplyReaderGetReply(redisReader *r, void **reply); int redisReplyReaderGetReply(redisReader *r, void **reply);
/* Backwards compatibility, can be removed on big version bump. */ /* Backwards compatibility, can be removed on big version bump. */
#define redisReplyReaderGetObject(_r) (((redisReader*)(r))->reply) #define redisReplyReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
#define redisReplyReaderGetError(_r) (((redisReader*)(r))->errstr) #define redisReplyReaderGetObject(_r) (((redisReader*)(_r))->reply)
#define redisReplyReaderGetError(_r) (((redisReader*)(_r))->errstr)
/* Functions to format a command according to the protocol. */ /* Functions to format a command according to the protocol. */
int redisvFormatCommand(char **target, const char *format, va_list ap); int redisvFormatCommand(char **target, const char *format, va_list ap);
......
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