summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalvatore Sanfilippo <antirez@gmail.com>2012-11-01 14:26:01 -0700
committerSalvatore Sanfilippo <antirez@gmail.com>2012-11-01 14:26:01 -0700
commitcc017c58398480b0b1976a58463954b4bfc084a4 (patch)
tree6f2ad3848f33b5b2c10e1e3f7e550ae4990eb0ae
parentb6ffa85f1128660bc742d8da9c4dc83bca5d9a91 (diff)
parented44a74e720918d2b1ab68f3d50600af38d2a5af (diff)
downloadredis-cc017c58398480b0b1976a58463954b4bfc084a4.tar.gz
Merge pull request #743 from Cofyc/fixtypo
fix typo in comments (redis.c, networking.c)
-rw-r--r--src/networking.c12
-rw-r--r--src/redis.c8
2 files changed, 10 insertions, 10 deletions
diff --git a/src/networking.c b/src/networking.c
index 844134638..22392f06d 100644
--- a/src/networking.c
+++ b/src/networking.c
@@ -489,8 +489,8 @@ void copyClientOutputBuffer(redisClient *dst, redisClient *src) {
static void acceptCommonHandler(int fd, int flags) {
redisClient *c;
if ((c = createClient(fd)) == NULL) {
- redisLog(REDIS_WARNING,"Error allocating resoures for the client");
- close(fd); /* May be already closed, just ingore errors */
+ redisLog(REDIS_WARNING,"Error allocating resources for the client");
+ close(fd); /* May be already closed, just ignore errors */
return;
}
/* If maxclient directive is set and this is one client more... close the
@@ -991,9 +991,9 @@ void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask) {
server.current_client = c;
readlen = REDIS_IOBUF_LEN;
/* If this is a multi bulk request, and we are processing a bulk reply
- * that is large enough, try to maximize the probabilty that the query
- * buffer contains excatly the SDS string representing the object, even
- * at the risk of requring more read(2) calls. This way the function
+ * that is large enough, try to maximize the probability that the query
+ * buffer contains exactly the SDS string representing the object, even
+ * at the risk of requiring more read(2) calls. This way the function
* processMultiBulkBuffer() can avoid copying buffers to create the
* Redis Object representing the argument. */
if (c->reqtype == REDIS_REQ_MULTIBULK && c->multibulklen && c->bulklen != -1
@@ -1231,7 +1231,7 @@ unsigned long getClientOutputBufferMemoryUsage(redisClient *c) {
return c->reply_bytes + (list_item_size*listLength(c->reply));
}
-/* Get the class of a client, used in order to envorce limits to different
+/* Get the class of a client, used in order to enforce limits to different
* classes of clients.
*
* The function will return one of the following:
diff --git a/src/redis.c b/src/redis.c
index 463dc2aac..87f5e812f 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -1527,7 +1527,7 @@ void call(redisClient *c, int flags) {
}
/* If this function gets called we already read a whole
- * command, argments are in the client argv/argc fields.
+ * command, arguments are in the client argv/argc fields.
* processCommand() execute the command or prepare the
* server for a bulk read from the client.
*
@@ -2175,7 +2175,7 @@ void infoCommand(redisClient *c) {
}
void monitorCommand(redisClient *c) {
- /* ignore MONITOR if aleady slave or in monitor mode */
+ /* ignore MONITOR if already slave or in monitor mode */
if (c->flags & REDIS_SLAVE) return;
c->flags |= (REDIS_SLAVE|REDIS_MONITOR);
@@ -2274,7 +2274,7 @@ int freeMemoryIfNeeded(void) {
de = dictGetRandomKey(dict);
thiskey = dictGetKey(de);
- /* When policy is volatile-lru we need an additonal lookup
+ /* When policy is volatile-lru we need an additional lookup
* to locate the real key, as dict is set to db->expires. */
if (server.maxmemory_policy == REDIS_MAXMEMORY_VOLATILE_LRU)
de = dictFind(db->dict, thiskey);
@@ -2576,7 +2576,7 @@ int main(int argc, char **argv) {
redisAsciiArt();
if (!server.sentinel_mode) {
- /* Things only needed when not runnign in Sentinel mode. */
+ /* Things only needed when not running in Sentinel mode. */
redisLog(REDIS_WARNING,"Server started, Redis version " REDIS_VERSION);
#ifdef __linux__
linuxOvercommitMemoryWarning();