diff options
-rw-r--r-- | CMakeLists.txt | 5 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | async.c | 8 | ||||
-rw-r--r-- | net.c | 4 | ||||
-rw-r--r-- | sds.c | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c8c8071..30140bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,10 @@ INSTALL(TARGETS hiredis INSTALL(FILES hiredis.h read.h sds.h async.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredis) - + +INSTALL(DIRECTORY adapters + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredis) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredis.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) @@ -406,6 +406,6 @@ as soon as possible in order to prevent allocation of useless memory. ## AUTHORS Hiredis was written by Salvatore Sanfilippo (antirez at gmail) and -Pieter Noordhuis (pcnoordhuis at gmail) and is released under the BSD license. +Pieter Noordhuis (pcnoordhuis at gmail) and is released under the BSD license. Hiredis is currently maintained by Matt Stancliff (matt at genges dot com) and Jan-Erik Rediger (janerik at fnordig dot com) @@ -34,8 +34,8 @@ #include <string.h> #ifndef _WIN32 #include <strings.h> -#else
-#define strcasecmp stricmp
+#else +#define strcasecmp stricmp #define strncasecmp strnicmp #endif #include <assert.h> @@ -438,7 +438,7 @@ static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, assert(reply->element[2]->type == REDIS_REPLY_INTEGER); /* Unset subscribed flag only when no pipelined pending subscribe. */ - if (reply->element[2]->integer == 0 + if (reply->element[2]->integer == 0 && dictSize(ac->sub.channels) == 0 && dictSize(ac->sub.patterns) == 0) c->flags &= ~REDIS_SUBSCRIBED; @@ -557,7 +557,7 @@ static int __redisAsyncHandleConnect(redisAsyncContext *ac) { /** * Handle SSL when socket becomes available for reading. This also handles * read-while-write and write-while-read. - * + * * These functions will not work properly unless `HIREDIS_SSL` is defined * (however, they will compile) */ @@ -435,9 +435,7 @@ addrretry: } /* For repeat connection */ - if (c->saddr) { - free(c->saddr); - } + free(c->saddr); c->saddr = malloc(p->ai_addrlen); memcpy(c->saddr, p->ai_addr, p->ai_addrlen); c->addrlen = p->ai_addrlen; @@ -1035,7 +1035,7 @@ sds *sdssplitargs(const char *line, int *argc) { s_free(vector); return NULL; } - + vector = new_vector; vector[*argc] = current; (*argc)++; |