luo980/hiredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More verbose type name

Browse Source
This commit is contained in:
Pieter Noordhuis 2011-07-12 09:44:41 +02:00
parent 095b376573
commit 21858350e8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parser.c
View File

@ -127,7 +127,7 @@ static const char *chrtos(char byte) {
#define LOG(fmt, ...) do { ; } while (0)
#endif
void redis_parser_init(redis_parser_t *parser, const redis_parser_cb_t *callbacks) {
void redis_parser_init(redis_parser_t *parser, const redis_parser_callbacks_t *callbacks) {
parser->stackidx = -1;
parser->callbacks = callbacks;
}
@ -142,7 +142,7 @@ void redis_parser_init(redis_parser_t *parser, const redis_parser_cb_t *callback
* re-initialized before parsing more data. */
size_t redis_parser_execute(redis_parser_t *parser, redis_protocol_t **dst, const char *buf, size_t len) {
redis_protocol_t *stack = parser->stack;
const redis_parser_cb_t *callbacks = parser->callbacks;
const redis_parser_callbacks_t *callbacks = parser->callbacks;
const char *pos;
const char *end;
size_t nread;

8
parser.h
View File

@ -10,7 +10,7 @@
#define REDIS_STATUS_T 5
#define REDIS_ERROR_T 6
typedef struct redis_parser_cb_s redis_parser_cb_t;
typedef struct redis_parser_callbacks_s redis_parser_callbacks_t;
typedef struct redis_protocol_s redis_protocol_t;
typedef struct redis_parser_s redis_parser_t;
@ -19,7 +19,7 @@ typedef int (*redis_array_cb)(redis_parser_t *, redis_protocol_t *, size_t);
typedef int (*redis_integer_cb)(redis_parser_t *, redis_protocol_t *, int64_t);
typedef int (*redis_nil_cb)(redis_parser_t *, redis_protocol_t *);
struct redis_parser_cb_s {
struct redis_parser_callbacks_s {
redis_string_cb on_string;
redis_array_cb on_array;
redis_integer_cb on_integer;
@ -55,7 +55,7 @@ struct redis_protocol_s {
struct redis_parser_s {
/* private: callbacks */
const redis_parser_cb_t *callbacks;
const redis_parser_callbacks_t *callbacks;
/* private: number of consumed bytes for a single message */
size_t nread;
@ -75,7 +75,7 @@ struct redis_parser_s {
} i64;
};
void redis_parser_init(redis_parser_t *parser, const redis_parser_cb_t *callbacks);
void redis_parser_init(redis_parser_t *parser, const redis_parser_callbacks_t *callbacks);
size_t redis_parser_execute(redis_parser_t *parser, redis_protocol_t **dst, const char *buf, size_t len);
redis_parser_errno_t redis_parser_errno(redis_parser_t *parser);
const char *redis_parser_strerror(redis_parser_errno_t errno);

2
test/parser.c
View File

@ -79,7 +79,7 @@ int on_nil(redis_parser_t *parser, redis_protocol_t *obj) {
return 1;
}
static redis_parser_cb_t callbacks = {
static redis_parser_callbacks_t callbacks = {
&on_string,
&on_array,
&on_integer,