diff options
author | not-a-robot[bot] <not-a-robot[bot]@users.noreply.github.com> | 2017-07-15 14:50:49 +0000 |
---|---|---|
committer | not-a-robot[bot] <not-a-robot[bot]@users.noreply.github.com> | 2017-07-15 14:50:49 +0000 |
commit | 97d611e9b58ea5d26a203aafe5a586a00d1e380c (patch) | |
tree | ebbede1630435cd68656c64e87decc2282f1c111 | |
parent | 74be165c8402739d329954ece50b1c4cfe9d1e16 (diff) | |
parent | 3c32344a41b1c9a7d6daccc2c54cf70b4dfd4d5b (diff) | |
download | hiredict-97d611e9b58ea5d26a203aafe5a586a00d1e380c.tar.xz |
Merge #533
533: Small fixes r=badboy
-rw-r--r-- | hiredis.c | 3 | ||||
-rw-r--r-- | net.c | 1 |
2 files changed, 1 insertions, 3 deletions
@@ -1007,9 +1007,8 @@ void *redisvCommand(redisContext *c, const char *format, va_list ap) { void *redisCommand(redisContext *c, const char *format, ...) { va_list ap; - void *reply = NULL; va_start(ap,format); - reply = redisvCommand(c,format,ap); + void *reply = redisvCommand(c,format,ap); va_end(ap); return reply; } @@ -143,7 +143,6 @@ int redisKeepAlive(redisContext *c, int interval) { } #else #if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) - val = interval; if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) { __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); return REDIS_ERR; |