Cleanup in redis-cli and tests: release memory on exit, change dup test name (#8475)
1. Rename 18-cluster-nodes-slots.tcl to 19-cluster-nodes-slots.tcl. it was conflicting with another test prefixed by 18 2. Release memory on exit in redis-cli.c. 3. Fix freeConvertedSds indentation.
This commit is contained in:
parent
8f9958dc24
commit
203f357c32
@ -1929,13 +1929,20 @@ static int confirmWithYes(char *msg, int ignore_force) {
|
|||||||
|
|
||||||
/* Turn the plain C strings into Sds strings */
|
/* Turn the plain C strings into Sds strings */
|
||||||
static char **convertToSds(int count, char** args) {
|
static char **convertToSds(int count, char** args) {
|
||||||
int j;
|
int j;
|
||||||
char **sds = zmalloc(sizeof(char*)*count);
|
char **sds = zmalloc(sizeof(char*)*count);
|
||||||
|
|
||||||
for(j = 0; j < count; j++)
|
for(j = 0; j < count; j++)
|
||||||
sds[j] = sdsnew(args[j]);
|
sds[j] = sdsnew(args[j]);
|
||||||
|
|
||||||
return sds;
|
return sds;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void freeConvertedSds(int count, char **sds) {
|
||||||
|
int j;
|
||||||
|
for (j = 0; j < count; j++)
|
||||||
|
sdsfree(sds[j]);
|
||||||
|
zfree(sds);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int issueCommandRepeat(int argc, char **argv, long repeat) {
|
static int issueCommandRepeat(int argc, char **argv, long repeat) {
|
||||||
@ -2168,13 +2175,17 @@ static void repl(void) {
|
|||||||
|
|
||||||
static int noninteractive(int argc, char **argv) {
|
static int noninteractive(int argc, char **argv) {
|
||||||
int retval = 0;
|
int retval = 0;
|
||||||
|
|
||||||
|
argv = convertToSds(argc, argv);
|
||||||
if (config.stdinarg) {
|
if (config.stdinarg) {
|
||||||
argv = zrealloc(argv, (argc+1)*sizeof(char*));
|
argv = zrealloc(argv, (argc+1)*sizeof(char*));
|
||||||
argv[argc] = readArgFromStdin();
|
argv[argc] = readArgFromStdin();
|
||||||
retval = issueCommand(argc+1, argv);
|
retval = issueCommand(argc+1, argv);
|
||||||
|
sdsfree(argv[argc]);
|
||||||
} else {
|
} else {
|
||||||
retval = issueCommand(argc, argv);
|
retval = issueCommand(argc, argv);
|
||||||
}
|
}
|
||||||
|
freeConvertedSds(argc, argv);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -8331,6 +8342,6 @@ int main(int argc, char **argv) {
|
|||||||
if (config.eval) {
|
if (config.eval) {
|
||||||
return evalMode(argc,argv);
|
return evalMode(argc,argv);
|
||||||
} else {
|
} else {
|
||||||
return noninteractive(argc,convertToSds(argc,argv));
|
return noninteractive(argc,argv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user