addReplySubSyntaxError() renamed to addReplySubcommandSyntaxError().

This commit is contained in:
antirez 2018-07-02 18:49:34 +02:00
parent bc6a004588
commit 2edcafb35d
12 changed files with 14 additions and 14 deletions

View File

@ -4746,7 +4746,7 @@ NULL
clusterReset(hard);
addReply(c,shared.ok);
} else {
addReplySubSyntaxError(c);
addReplySubcommandSyntaxError(c);
return;
}
}

View File

@ -2168,7 +2168,7 @@ NULL
addReply(c,shared.ok);
}
} else {
addReplySubSyntaxError(c);
addReplySubcommandSyntaxError(c);
return;
}
}

View File

@ -582,7 +582,7 @@ NULL
clearReplicationId2();
addReply(c,shared.ok);
} else {
addReplySubSyntaxError(c);
addReplySubcommandSyntaxError(c);
return;
}
}

View File

@ -4559,7 +4559,7 @@ NULL
}
dictReleaseIterator(di);
} else {
addReplySubSyntaxError(c);
addReplySubcommandSyntaxError(c);
return;
}
}

View File

@ -565,13 +565,13 @@ void addReplyHelp(client *c, const char **help) {
/* Add a suggestive error reply.
* This function is typically invoked by from commands that support
* subcommands in response to an unknown subcommand or argument error. */
void addReplySubSyntaxError(client *c) {
void addReplySubcommandSyntaxError(client *c) {
sds cmd = sdsnew((char*) c->argv[0]->ptr);
sdstoupper(cmd);
addReplyErrorFormat(c,
"Unknown subcommand or wrong number of arguments for '%s'. Try %s HELP.",
c->argv[1]->ptr,cmd);
sdsfree(cmd);
sdsfree(cmd);
}
/* Copy 'src' client output buffers into 'dst' client output buffers.

View File

@ -1254,7 +1254,7 @@ NULL
* when the key is read or overwritten. */
addReplyLongLong(c,LFUDecrAndReturn(o));
} else {
addReplySubSyntaxError(c);
addReplySubcommandSyntaxError(c);
}
}

View File

@ -372,6 +372,6 @@ NULL
/* PUBSUB NUMPAT */
addReplyLongLong(c,listLength(server.pubsub_patterns));
} else {
addReplySubSyntaxError(c);
addReplySubcommandSyntaxError(c);
}
}

View File

@ -1514,7 +1514,7 @@ NULL
return;
}
} else {
addReplySubSyntaxError(c);
addReplySubcommandSyntaxError(c);
}
}

View File

@ -2876,7 +2876,7 @@ NULL
getKeysFreeResult(keys);
}
} else {
addReplySubSyntaxError(c);
addReplySubcommandSyntaxError(c);
}
}

View File

@ -1413,7 +1413,7 @@ void addReplyHumanLongDouble(client *c, long double d);
void addReplyLongLong(client *c, long long ll);
void addReplyMultiBulkLen(client *c, long length);
void addReplyHelp(client *c, const char **help);
void addReplySubSyntaxError(client *c);
void addReplySubcommandSyntaxError(client *c);
void copyClientOutputBuffer(client *dst, client *src);
size_t sdsZmallocSize(sds s);
size_t getStringObjectSdsUsedMemory(robj *o);

View File

@ -187,6 +187,6 @@ NULL
}
setDeferredMultiBulkLength(c,totentries,sent);
} else {
addReplySubSyntaxError(c);
addReplySubcommandSyntaxError(c);
}
}

View File

@ -1650,7 +1650,7 @@ NULL
} else if (!strcasecmp(opt,"HELP")) {
addReplyHelp(c, help);
} else {
addReplySubSyntaxError(c);
addReplySubcommandSyntaxError(c);
}
}
@ -2277,7 +2277,7 @@ NULL
STREAM_RWR_RAWENTRIES,NULL);
if (!count) addReply(c,shared.nullbulk);
} else {
addReplySubSyntaxError(c);
addReplySubcommandSyntaxError(c);
}
}