Merge branch 'unstable' of github.com:/antirez/redis into unstable

2 files changed, 2 insertions, 2 deletions

diff --git a/src/redismodule.h b/src/redismodule.h
index f1aaea49b..fd9e46dc6 100644
--- a/src/redismodule.h
+++ b/src/redismodule.h
@@ -100,7 +100,7 @@ typedef void (*RedisModuleTypeFreeFunc)(void *value);
 void *REDISMODULE_API_FUNC(RedisModule_Alloc)(size_t bytes);
 void *REDISMODULE_API_FUNC(RedisModule_Realloc)(void *ptr, size_t bytes);
 void REDISMODULE_API_FUNC(RedisModule_Free)(void *ptr);
-void REDISMODULE_API_FUNC(RedisModule_Calloc)(size_t nmemb, size_t size);
+void *REDISMODULE_API_FUNC(RedisModule_Calloc)(size_t nmemb, size_t size);
 char *REDISMODULE_API_FUNC(RedisModule_Strdup)(const char *str);
 int REDISMODULE_API_FUNC(RedisModule_GetApi)(const char *, void *);
 int REDISMODULE_API_FUNC(RedisModule_CreateCommand)(RedisModuleCtx *ctx, const char *name, RedisModuleCmdFunc cmdfunc, const char *strflags, int firstkey, int lastkey, int keystep);
diff --git a/src/server.c b/src/server.c
index e2a636258..06244081f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3825,7 +3825,7 @@ void setupSignalHandlers(void) {
 void memtest(size_t megabytes, int passes);
 
 /* Returns 1 if there is --sentinel among the arguments or if
- * argv[0] is exactly "redis-sentinel". */
+ * argv[0] contains "redis-sentinel". */
 int checkForSentinelMode(int argc, char **argv) {
     int j;