mirror of https://github.com/redis/redis.git
				
				
				
			addReplySubSyntaxError() renamed to addReplySubcommandSyntaxError().
This commit is contained in:
		
							parent
							
								
									bc6a004588
								
							
						
					
					
						commit
						2edcafb35d
					
				| 
						 | 
					@ -4746,7 +4746,7 @@ NULL
 | 
				
			||||||
        clusterReset(hard);
 | 
					        clusterReset(hard);
 | 
				
			||||||
        addReply(c,shared.ok);
 | 
					        addReply(c,shared.ok);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        addReplySubSyntaxError(c);
 | 
					        addReplySubcommandSyntaxError(c);
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2168,7 +2168,7 @@ NULL
 | 
				
			||||||
            addReply(c,shared.ok);
 | 
					            addReply(c,shared.ok);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        addReplySubSyntaxError(c);
 | 
					        addReplySubcommandSyntaxError(c);
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -582,7 +582,7 @@ NULL
 | 
				
			||||||
        clearReplicationId2();
 | 
					        clearReplicationId2();
 | 
				
			||||||
        addReply(c,shared.ok);
 | 
					        addReply(c,shared.ok);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        addReplySubSyntaxError(c);
 | 
					        addReplySubcommandSyntaxError(c);
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4559,7 +4559,7 @@ NULL
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        dictReleaseIterator(di);
 | 
					        dictReleaseIterator(di);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        addReplySubSyntaxError(c);
 | 
					        addReplySubcommandSyntaxError(c);
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -565,13 +565,13 @@ void addReplyHelp(client *c, const char **help) {
 | 
				
			||||||
/* Add a suggestive error reply.
 | 
					/* Add a suggestive error reply.
 | 
				
			||||||
 * This function is typically invoked by from commands that support
 | 
					 * This function is typically invoked by from commands that support
 | 
				
			||||||
 * subcommands in response to an unknown subcommand or argument error. */
 | 
					 * 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);
 | 
					    sds cmd = sdsnew((char*) c->argv[0]->ptr);
 | 
				
			||||||
    sdstoupper(cmd);
 | 
					    sdstoupper(cmd);
 | 
				
			||||||
    addReplyErrorFormat(c,
 | 
					    addReplyErrorFormat(c,
 | 
				
			||||||
        "Unknown subcommand or wrong number of arguments for '%s'. Try %s HELP.",
 | 
					        "Unknown subcommand or wrong number of arguments for '%s'. Try %s HELP.",
 | 
				
			||||||
        c->argv[1]->ptr,cmd);
 | 
					        c->argv[1]->ptr,cmd);
 | 
				
			||||||
    sdsfree(cmd);    
 | 
					    sdsfree(cmd);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Copy 'src' client output buffers into 'dst' client output buffers.
 | 
					/* Copy 'src' client output buffers into 'dst' client output buffers.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1254,7 +1254,7 @@ NULL
 | 
				
			||||||
         * when the key is read or overwritten. */
 | 
					         * when the key is read or overwritten. */
 | 
				
			||||||
        addReplyLongLong(c,LFUDecrAndReturn(o));
 | 
					        addReplyLongLong(c,LFUDecrAndReturn(o));
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        addReplySubSyntaxError(c);
 | 
					        addReplySubcommandSyntaxError(c);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -372,6 +372,6 @@ NULL
 | 
				
			||||||
        /* PUBSUB NUMPAT */
 | 
					        /* PUBSUB NUMPAT */
 | 
				
			||||||
        addReplyLongLong(c,listLength(server.pubsub_patterns));
 | 
					        addReplyLongLong(c,listLength(server.pubsub_patterns));
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        addReplySubSyntaxError(c);
 | 
					        addReplySubcommandSyntaxError(c);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1514,7 +1514,7 @@ NULL
 | 
				
			||||||
            return;
 | 
					            return;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        addReplySubSyntaxError(c);
 | 
					        addReplySubcommandSyntaxError(c);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2876,7 +2876,7 @@ NULL
 | 
				
			||||||
            getKeysFreeResult(keys);
 | 
					            getKeysFreeResult(keys);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        addReplySubSyntaxError(c);
 | 
					        addReplySubcommandSyntaxError(c);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1413,7 +1413,7 @@ void addReplyHumanLongDouble(client *c, long double d);
 | 
				
			||||||
void addReplyLongLong(client *c, long long ll);
 | 
					void addReplyLongLong(client *c, long long ll);
 | 
				
			||||||
void addReplyMultiBulkLen(client *c, long length);
 | 
					void addReplyMultiBulkLen(client *c, long length);
 | 
				
			||||||
void addReplyHelp(client *c, const char **help);
 | 
					void addReplyHelp(client *c, const char **help);
 | 
				
			||||||
void addReplySubSyntaxError(client *c);
 | 
					void addReplySubcommandSyntaxError(client *c);
 | 
				
			||||||
void copyClientOutputBuffer(client *dst, client *src);
 | 
					void copyClientOutputBuffer(client *dst, client *src);
 | 
				
			||||||
size_t sdsZmallocSize(sds s);
 | 
					size_t sdsZmallocSize(sds s);
 | 
				
			||||||
size_t getStringObjectSdsUsedMemory(robj *o);
 | 
					size_t getStringObjectSdsUsedMemory(robj *o);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -187,6 +187,6 @@ NULL
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        setDeferredMultiBulkLength(c,totentries,sent);
 | 
					        setDeferredMultiBulkLength(c,totentries,sent);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        addReplySubSyntaxError(c);
 | 
					        addReplySubcommandSyntaxError(c);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1650,7 +1650,7 @@ NULL
 | 
				
			||||||
    } else if (!strcasecmp(opt,"HELP")) {
 | 
					    } else if (!strcasecmp(opt,"HELP")) {
 | 
				
			||||||
        addReplyHelp(c, help);
 | 
					        addReplyHelp(c, help);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        addReplySubSyntaxError(c);
 | 
					        addReplySubcommandSyntaxError(c);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2277,7 +2277,7 @@ NULL
 | 
				
			||||||
                                     STREAM_RWR_RAWENTRIES,NULL);
 | 
					                                     STREAM_RWR_RAWENTRIES,NULL);
 | 
				
			||||||
        if (!count) addReply(c,shared.nullbulk);
 | 
					        if (!count) addReply(c,shared.nullbulk);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        addReplySubSyntaxError(c);
 | 
					        addReplySubcommandSyntaxError(c);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue