zeekling/hiredis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Expose redisGetReplyFromReader as public API

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-11-03 00:40:07 +01:00
parent 314c04840b
commit e13674dd4e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hiredis.c
View File

@ -744,7 +744,7 @@ int redisBufferWrite(redisContext *c, int *done) {
/* Internal helper function to try and get a reply from the reader, /* Internal helper function to try and get a reply from the reader,
* or set an error in the context otherwise. */ * or set an error in the context otherwise. */
static int __redisGetReply(redisContext *c, void **reply) { int redisGetReplyFromReader(redisContext *c, void **reply) {
__redisCreateReplyReader(c); __redisCreateReplyReader(c);
if (redisReplyReaderGetReply(c->reader,reply) == REDIS_ERR) { if (redisReplyReaderGetReply(c->reader,reply) == REDIS_ERR) {
__redisSetError(c,REDIS_ERR_PROTOCOL, __redisSetError(c,REDIS_ERR_PROTOCOL,
@ -759,7 +759,7 @@ int redisGetReply(redisContext *c, void **reply) {
void *aux = NULL; void *aux = NULL;
/* Try to read pending replies */ /* Try to read pending replies */
if (__redisGetReply(c,&aux) == REDIS_ERR) if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
return REDIS_ERR; return REDIS_ERR;
/* For the blocking context, flush output buffer and read reply */ /* For the blocking context, flush output buffer and read reply */
@ -774,7 +774,7 @@ int redisGetReply(redisContext *c, void **reply) {
do { do {
if (redisBufferRead(c) == REDIS_ERR) if (redisBufferRead(c) == REDIS_ERR)
return REDIS_ERR; return REDIS_ERR;
if (__redisGetReply(c,&aux) == REDIS_ERR) if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
return REDIS_ERR; return REDIS_ERR;
} while (aux == NULL); } while (aux == NULL);
} }

1
hiredis.h
View File

@ -130,6 +130,7 @@ int redisBufferWrite(redisContext *c, int *done);
* buffer to the socket and reads until it has a reply. In a non-blocking * buffer to the socket and reads until it has a reply. In a non-blocking
* context, it will return unconsumed replies until there are no more. */ * context, it will return unconsumed replies until there are no more. */
int redisGetReply(redisContext *c, void **reply); int redisGetReply(redisContext *c, void **reply);
int redisGetReplyFromReader(redisContext *c, void **reply);
/* Write a command to the output buffer. Use these functions in blocking mode /* Write a command to the output buffer. Use these functions in blocking mode
* to get a pipeline of commands. */ * to get a pipeline of commands. */