From f4f6b6d65c83df53ac4e7a6730440ea7af368fcd Mon Sep 17 00:00:00 2001 From: Mark Nunberg Date: Wed, 12 Dec 2018 11:36:52 -0500 Subject: [PATCH] minor fixes: initialize options struct with 0 always also, clean up redisContextInit -- we're just zeoring the struct --- hiredis.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hiredis.c b/hiredis.c index d33e393..7ba51f6 100644 --- a/hiredis.c +++ b/hiredis.c @@ -591,21 +591,14 @@ static redisContext *redisContextInit(const redisOptions *options) { if (c == NULL) return NULL; - c->err = 0; - c->errstr[0] = '\0'; 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(); if (c->obuf == NULL || c->reader == NULL) { redisFree(c); return NULL; } - + (void)options; /* options are used in other functions */ return c; } @@ -753,7 +746,8 @@ redisContext *redisConnectUnixNonBlock(const char *path) { } redisContext *redisConnectFd(int fd) { - redisOptions options = {REDIS_CONN_USERFD}; + redisOptions options = {0}; + options.type = REDIS_CONN_USERFD; options.endpoint.fd = fd; return redisConnectWithOptions(&options); }