Skip to content

Commit

Permalink
Rename *ReplyReader* to *Reader*
Browse files Browse the repository at this point in the history
  • Loading branch information
@pietern
pietern committed Apr 21, 2011
1 parent 0ee7c66 commit 965d426
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 23 deletions.
38 changes: 19 additions & 19 deletions hiredis.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ static void *createNilObject(const redisReadTask *task) {
return r;
}

static void __redisReplyReaderSetError(redisReader *r, int type, const char *str) {
static void __redisReaderSetError(redisReader *r, int type, const char *str) {
size_t len;

if (r->reply != NULL && r->fn && r->fn->freeObject) {
Expand All @@ -207,17 +207,17 @@ static void __redisReplyReaderSetError(redisReader *r, int type, const char *str
r->errstr[len] = '\0';
}

static void __redisReplyReaderSetErrorProtocolByte(redisReader *r, char byte) {
static void __redisReaderSetErrorProtocolByte(redisReader *r, char byte) {
char cbuf[8], sbuf[128];

chrtos(cbuf,sizeof(cbuf),byte);
snprintf(sbuf,sizeof(sbuf),
"Protocol error, got %s as reply type byte", cbuf);
__redisReplyReaderSetError(r,REDIS_ERR_PROTOCOL,sbuf);
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,sbuf);
}

static void __redisReplyReaderSetErrorOOM(redisReader *r) {
__redisReplyReaderSetError(r,REDIS_ERR_OOM,"Out of memory");
static void __redisReaderSetErrorOOM(redisReader *r) {
__redisReaderSetError(r,REDIS_ERR_OOM,"Out of memory");
}

static char *readBytes(redisReader *r, unsigned int bytes) {
Expand Down Expand Up @@ -347,7 +347,7 @@ static int processLineItem(redisReader *r) {
}

if (obj == NULL) {
__redisReplyReaderSetErrorOOM(r);
__redisReaderSetErrorOOM(r);
return REDIS_ERR;
}

Expand Down Expand Up @@ -397,7 +397,7 @@ static int processBulkItem(redisReader *r) {
/* Proceed when obj was created. */
if (success) {
if (obj == NULL) {
__redisReplyReaderSetErrorOOM(r);
__redisReaderSetErrorOOM(r);
return REDIS_ERR;
}

Expand All @@ -422,7 +422,7 @@ static int processMultiBulkItem(redisReader *r) {

/* Set error for nested multi bulks with depth > 1 */
if (r->ridx == 2) {
__redisReplyReaderSetError(r,REDIS_ERR_PROTOCOL,
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
"No support for nested multi bulk replies with depth > 1");
return REDIS_ERR;
}
Expand All @@ -438,7 +438,7 @@ static int processMultiBulkItem(redisReader *r) {
obj = (void*)REDIS_REPLY_NIL;

if (obj == NULL) {
__redisReplyReaderSetErrorOOM(r);
__redisReaderSetErrorOOM(r);
return REDIS_ERR;
}

Expand All @@ -450,7 +450,7 @@ static int processMultiBulkItem(redisReader *r) {
obj = (void*)REDIS_REPLY_ARRAY;

if (obj == NULL) {
__redisReplyReaderSetErrorOOM(r);
__redisReaderSetErrorOOM(r);
return REDIS_ERR;
}

Expand Down Expand Up @@ -502,7 +502,7 @@ static int processItem(redisReader *r) {
cur->type = REDIS_REPLY_ARRAY;
break;
default:
__redisReplyReaderSetErrorProtocolByte(r,*p);
__redisReaderSetErrorProtocolByte(r,*p);
return REDIS_ERR;
}
} else {
Expand All @@ -527,7 +527,7 @@ static int processItem(redisReader *r) {
}
}

redisReader *redisReplyReaderCreate(void) {
redisReader *redisReaderCreate(void) {
redisReader *r;

r = calloc(sizeof(redisReader),1);
Expand All @@ -542,15 +542,15 @@ redisReader *redisReplyReaderCreate(void) {
return r;
}

void redisReplyReaderFree(redisReader *r) {
void redisReaderFree(redisReader *r) {
if (r->reply != NULL && r->fn && r->fn->freeObject)
r->fn->freeObject(r->reply);
if (r->buf != NULL)
sdsfree(r->buf);
free(r);
}

void redisReplyReaderFeed(redisReader *r, const char *buf, size_t len) {
void redisReaderFeed(redisReader *r, const char *buf, size_t len) {
/* Copy the provided buffer. */
if (buf != NULL && len >= 1) {
/* Destroy internal buffer when it is empty and is quite large. */
Expand All @@ -565,7 +565,7 @@ void redisReplyReaderFeed(redisReader *r, const char *buf, size_t len) {
}
}

int redisReplyReaderGetReply(redisReader *r, void **reply) {
int redisReaderGetReply(redisReader *r, void **reply) {
/* Default target pointer to NULL. */
if (reply != NULL)
*reply = NULL;
Expand Down Expand Up @@ -854,7 +854,7 @@ static redisContext *redisContextInit(void) {
c->err = 0;
c->errstr[0] = '\0';
c->obuf = sdsempty();
c->reader = redisReplyReaderCreate();
c->reader = redisReaderCreate();
return c;
}

Expand All @@ -864,7 +864,7 @@ void redisFree(redisContext *c) {
if (c->obuf != NULL)
sdsfree(c->obuf);
if (c->reader != NULL)
redisReplyReaderFree(c->reader);
redisReaderFree(c->reader);
free(c);
}

Expand Down Expand Up @@ -939,7 +939,7 @@ int redisBufferRead(redisContext *c) {
__redisSetError(c,REDIS_ERR_EOF,"Server closed the connection");
return REDIS_ERR;
} else {
redisReplyReaderFeed(c->reader,buf,nread);
redisReaderFeed(c->reader,buf,nread);
}
return REDIS_OK;
}
Expand Down Expand Up @@ -980,7 +980,7 @@ int redisBufferWrite(redisContext *c, int *done) {
/* Internal helper function to try and get a reply from the reader,
* or set an error in the context otherwise. */
int redisGetReplyFromReader(redisContext *c, void **reply) {
if (redisReplyReaderGetReply(c->reader,reply) == REDIS_ERR) {
if (redisReaderGetReply(c->reader,reply) == REDIS_ERR) {
__redisSetError(c,REDIS_ERR_PROTOCOL,c->reader->errstr);
return REDIS_ERR;
}
Expand Down
12 changes: 8 additions & 4 deletions hiredis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,16 @@ typedef struct redisReader {
} redisReader;

/* Public API for the protocol parser. */
redisReader *redisReplyReaderCreate(void);
void redisReplyReaderFree(redisReader *r);
void redisReplyReaderFeed(redisReader *r, const char *buf, size_t len);
int redisReplyReaderGetReply(redisReader *r, void **reply);
redisReader *redisReaderCreate(void);
void redisReaderFree(redisReader *r);
void redisReaderFeed(redisReader *r, const char *buf, size_t len);
int redisReaderGetReply(redisReader *r, void **reply);

/* Backwards compatibility, can be removed on big version bump. */
#define redisReplyReaderCreate redisReaderCreate
#define redisReplyReaderFree redisReaderFree
#define redisReplyReaderFeed redisReaderFeed
#define redisReplyReaderGetReply redisReaderGetReply
#define redisReplyReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
#define redisReplyReaderGetObject(_r) (((redisReader*)(_r))->reply)
#define redisReplyReaderGetError(_r) (((redisReader*)(_r))->errstr)
Expand Down

0 comments on commit 965d426

Please sign in to comment.