Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
dc18a6a6
Commit
dc18a6a6
authored
Jun 27, 2016
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
5e176e1a
ae4f5b30
Changes
2
Show whitespace changes
Inline
Side-by-side
src/redismodule.h
View file @
dc18a6a6
...
...
@@ -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
);
...
...
src/server.c
View file @
dc18a6a6
...
...
@@ -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;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment