fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 09:00:51 +00:00
Code Issues Projects Releases Wiki Activity

str can be free'd outside readString

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-05-05 14:06:55 +02:00
parent 57ca68acc1
commit e51fa063db
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
redis-check-aof.c
View File

@ -58,13 +58,9 @@ int readString(FILE *fp, char** target) {
len += 2;
*target = (char*)malloc(len);
if (!readBytes(fp,*target,len)) {
free(*target);
*target = NULL;
return 0;
}
if (!consumeNewline(*target+len-2)) {
free(*target);
*target = NULL;
return 0;
}
(*target)[len-2] = '\0';
@ -82,14 +78,10 @@ long process(FILE *fp) {
while(1) {
if (!multi) pos = ftell(fp);
if (!readArgc(fp, &argc)) {
break;
}
if (!readArgc(fp, &argc)) break;
for (i = 0; i < argc; i++) {
if (!readString(fp,&str)) {
break;
}
if (!readString(fp,&str)) break;
if (i == 0) {
if (strcasecmp(str, "multi") == 0) {
if (multi++) {
@ -106,7 +98,7 @@ long process(FILE *fp) {
free(str);
}
/* Check if loop was finished */
/* Stop if the loop did not finish */
if (i < argc) {
if (str) free(str);
break;
@ -116,11 +108,9 @@ long process(FILE *fp) {
if (feof(fp) && multi && strlen(error) == 0) {
ERROR("Reached EOF before reading EXEC for MULTI");
}
if (strlen(error) > 0) {
printf("%s\n", error);
}
return pos;
}