Unverified Commit c259f905 authored by Mark Nunberg's avatar Mark Nunberg Committed by GitHub
Browse files

Merge pull request #691 from Miniwoffer/master

Removed whitespace before newline
parents f5f855c9 a1d4da63
......@@ -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)
*/
......
......@@ -1035,7 +1035,7 @@ sds *sdssplitargs(const char *line, int *argc) {
s_free(vector);
return NULL;
}
vector = new_vector;
vector[*argc] = current;
(*argc)++;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment