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

minor fixes: initialize options struct with 0 always

Browse Source 
also, clean up redisContextInit -- we're just zeoring the struct
This commit is contained in:
Mark Nunberg 2018-12-12 11:36:52 -05:00
parent 7b705936f6
commit f4f6b6d65c
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hiredis.c
View File

@ -591,21 +591,14 @@ static redisContext *redisContextInit(const redisOptions *options) {
if (c == NULL) if (c == NULL)
return NULL; return NULL;
c->err = 0;
c->errstr[0] = '\0';
c->obuf = sdsempty(); c->obuf = sdsempty();
c->flags = 0;
c->tcp.host = NULL;
c->tcp.source_addr = NULL;
c->unix_sock.path = NULL;
c->timeout = NULL;
c->reader = redisReaderCreate(); c->reader = redisReaderCreate();
if (c->obuf == NULL || c->reader == NULL) { if (c->obuf == NULL || c->reader == NULL) {
redisFree(c); redisFree(c);
return NULL; return NULL;
} }
(void)options; /* options are used in other functions */
return c; return c;
} }
@ -753,7 +746,8 @@ redisContext *redisConnectUnixNonBlock(const char *path) {
} }
redisContext *redisConnectFd(int fd) { redisContext *redisConnectFd(int fd) {
redisOptions options = {REDIS_CONN_USERFD}; redisOptions options = {0};
options.type = REDIS_CONN_USERFD;
options.endpoint.fd = fd; options.endpoint.fd = fd;
return redisConnectWithOptions(&options); return redisConnectWithOptions(&options);
} }