From bb3475e8eb379ee18f3d8f37caa8040b852a6213 Mon Sep 17 00:00:00 2001 From: "Anna (navi) Figueiredo Gomes" Date: Sat, 23 Mar 2024 01:21:46 +0100 Subject: all: rename redis -> redict symbols and comments Signed-off-by: Anna (navi) Figueiredo Gomes --- read.h | 104 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) (limited to 'read.h') diff --git a/read.h b/read.h index 9beff7e..f36587a 100644 --- a/read.h +++ b/read.h @@ -12,69 +12,69 @@ */ -#ifndef __HIREDIS_READ_H -#define __HIREDIS_READ_H +#ifndef __HIREDICT_READ_H +#define __HIREDICT_READ_H #include /* for size_t */ -#define REDIS_ERR -1 -#define REDIS_OK 0 +#define REDICT_ERR -1 +#define REDICT_OK 0 /* When an error occurs, the err flag in a context is set to hold the type of - * error that occurred. REDIS_ERR_IO means there was an I/O error and you + * error that occurred. REDICT_ERR_IO means there was an I/O error and you * should use the "errno" variable to find out what is wrong. * For other values, the "errstr" field will hold a description. */ -#define REDIS_ERR_IO 1 /* Error in read or write */ -#define REDIS_ERR_EOF 3 /* End of file */ -#define REDIS_ERR_PROTOCOL 4 /* Protocol error */ -#define REDIS_ERR_OOM 5 /* Out of memory */ -#define REDIS_ERR_TIMEOUT 6 /* Timed out */ -#define REDIS_ERR_OTHER 2 /* Everything else... */ - -#define REDIS_REPLY_STRING 1 -#define REDIS_REPLY_ARRAY 2 -#define REDIS_REPLY_INTEGER 3 -#define REDIS_REPLY_NIL 4 -#define REDIS_REPLY_STATUS 5 -#define REDIS_REPLY_ERROR 6 -#define REDIS_REPLY_DOUBLE 7 -#define REDIS_REPLY_BOOL 8 -#define REDIS_REPLY_MAP 9 -#define REDIS_REPLY_SET 10 -#define REDIS_REPLY_ATTR 11 -#define REDIS_REPLY_PUSH 12 -#define REDIS_REPLY_BIGNUM 13 -#define REDIS_REPLY_VERB 14 +#define REDICT_ERR_IO 1 /* Error in read or write */ +#define REDICT_ERR_EOF 3 /* End of file */ +#define REDICT_ERR_PROTOCOL 4 /* Protocol error */ +#define REDICT_ERR_OOM 5 /* Out of memory */ +#define REDICT_ERR_TIMEOUT 6 /* Timed out */ +#define REDICT_ERR_OTHER 2 /* Everything else... */ + +#define REDICT_REPLY_STRING 1 +#define REDICT_REPLY_ARRAY 2 +#define REDICT_REPLY_INTEGER 3 +#define REDICT_REPLY_NIL 4 +#define REDICT_REPLY_STATUS 5 +#define REDICT_REPLY_ERROR 6 +#define REDICT_REPLY_DOUBLE 7 +#define REDICT_REPLY_BOOL 8 +#define REDICT_REPLY_MAP 9 +#define REDICT_REPLY_SET 10 +#define REDICT_REPLY_ATTR 11 +#define REDICT_REPLY_PUSH 12 +#define REDICT_REPLY_BIGNUM 13 +#define REDICT_REPLY_VERB 14 /* Default max unused reader buffer. */ -#define REDIS_READER_MAX_BUF (1024*16) +#define REDICT_READER_MAX_BUF (1024*16) /* Default multi-bulk element limit */ -#define REDIS_READER_MAX_ARRAY_ELEMENTS ((1LL<<32) - 1) +#define REDICT_READER_MAX_ARRAY_ELEMENTS ((1LL<<32) - 1) #ifdef __cplusplus extern "C" { #endif -typedef struct redisReadTask { +typedef struct redictReadTask { int type; long long elements; /* number of elements in multibulk container */ int idx; /* index in parent (array) object */ void *obj; /* holds user-generated value for a read task */ - struct redisReadTask *parent; /* parent task */ + struct redictReadTask *parent; /* parent task */ void *privdata; /* user-settable arbitrary field */ -} redisReadTask; - -typedef struct redisReplyObjectFunctions { - void *(*createString)(const redisReadTask*, char*, size_t); - void *(*createArray)(const redisReadTask*, size_t); - void *(*createInteger)(const redisReadTask*, long long); - void *(*createDouble)(const redisReadTask*, double, char*, size_t); - void *(*createNil)(const redisReadTask*); - void *(*createBool)(const redisReadTask*, int); +} redictReadTask; + +typedef struct redictReplyObjectFunctions { + void *(*createString)(const redictReadTask*, char*, size_t); + void *(*createArray)(const redictReadTask*, size_t); + void *(*createInteger)(const redictReadTask*, long long); + void *(*createDouble)(const redictReadTask*, double, char*, size_t); + void *(*createNil)(const redictReadTask*); + void *(*createBool)(const redictReadTask*, int); void (*freeObject)(void*); -} redisReplyObjectFunctions; +} redictReplyObjectFunctions; -typedef struct redisReader { +typedef struct redictReader { int err; /* Error flags, 0 when there is no error */ char errstr[128]; /* String representation of error when applicable */ @@ -84,25 +84,25 @@ typedef struct redisReader { size_t maxbuf; /* Max length of unused buffer */ long long maxelements; /* Max multi-bulk elements */ - redisReadTask **task; + redictReadTask **task; int tasks; int ridx; /* Index of current read task */ void *reply; /* Temporary reply pointer */ - redisReplyObjectFunctions *fn; + redictReplyObjectFunctions *fn; void *privdata; -} redisReader; +} redictReader; /* Public API for the protocol parser. */ -redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn); -void redisReaderFree(redisReader *r); -int redisReaderFeed(redisReader *r, const char *buf, size_t len); -int redisReaderGetReply(redisReader *r, void **reply); - -#define redisReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p)) -#define redisReaderGetObject(_r) (((redisReader*)(_r))->reply) -#define redisReaderGetError(_r) (((redisReader*)(_r))->errstr) +redictReader *redictReaderCreateWithFunctions(redictReplyObjectFunctions *fn); +void redictReaderFree(redictReader *r); +int redictReaderFeed(redictReader *r, const char *buf, size_t len); +int redictReaderGetReply(redictReader *r, void **reply); + +#define redictReaderSetPrivdata(_r, _p) (int)(((redictReader*)(_r))->privdata = (_p)) +#define redictReaderGetObject(_r) (((redictReader*)(_r))->reply) +#define redictReaderGetError(_r) (((redictReader*)(_r))->errstr) #ifdef __cplusplus } -- cgit v1.2.3