Commit 435e545d authored by Pieter Noordhuis's avatar Pieter Noordhuis
Browse files

Fix redisGetReply

parent 6042c569
...@@ -800,15 +800,11 @@ int redisGetReply(redisContext *c, void **reply) { ...@@ -800,15 +800,11 @@ 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 (__redisGetReply(c,&aux) == REDIS_ERR)
return REDIS_ERR; return REDIS_ERR;
} else {
/* Return immediately if there was a pending reply */
if (aux != NULL) return REDIS_OK;
}
/* For the blocking context, flush output buffer and read reply */ /* For the blocking context, flush output buffer and read reply */
if (c->flags & REDIS_BLOCK) { if (aux == NULL && c->flags & REDIS_BLOCK) {
/* Write until done */ /* Write until done */
do { do {
if (redisBufferWrite(c,&wdone) == REDIS_ERR) if (redisBufferWrite(c,&wdone) == REDIS_ERR)
...@@ -822,10 +818,10 @@ int redisGetReply(redisContext *c, void **reply) { ...@@ -822,10 +818,10 @@ int redisGetReply(redisContext *c, void **reply) {
if (__redisGetReply(c,&aux) == REDIS_ERR) if (__redisGetReply(c,&aux) == REDIS_ERR)
return REDIS_ERR; return REDIS_ERR;
} while (aux == NULL); } while (aux == NULL);
/* Set reply object */
if (reply != NULL) *reply = aux;
} }
/* Set reply object */
if (reply != NULL) *reply = aux;
return REDIS_OK; return REDIS_OK;
} }
......
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