summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Rutkovsky <aaron.rutkovsky@gmail.com>2014-01-16 22:02:38 -0600
committerMatt Stancliff <matt@genges.com>2014-09-29 06:49:07 -0400
commit3a82b8ac641120c231f4f7e8a2edc0bd1c40a399 (patch)
treeb2b49541a20eb59c7e9cff479b5568e0bfd29097
parent9f98b29cefc337d607016cea57216cde1c25dd47 (diff)
downloadredis-3a82b8ac641120c231f4f7e8a2edc0bd1c40a399.tar.gz
Fix typos
Closes #1513
-rw-r--r--deps/hiredis/test.c2
-rw-r--r--src/adlist.c2
-rw-r--r--src/replication.c8
-rw-r--r--tests/test_helper.tcl2
4 files changed, 7 insertions, 7 deletions
diff --git a/deps/hiredis/test.c b/deps/hiredis/test.c
index 713cc06c5..2cc35a46f 100644
--- a/deps/hiredis/test.c
+++ b/deps/hiredis/test.c
@@ -51,7 +51,7 @@ static redisContext *select_database(redisContext *c) {
assert(reply != NULL);
freeReplyObject(reply);
- /* Make sure the DB is emtpy */
+ /* Make sure the DB is empty */
reply = redisCommand(c,"DBSIZE");
assert(reply != NULL);
if (reply->type == REDIS_REPLY_INTEGER && reply->integer == 0) {
diff --git a/src/adlist.c b/src/adlist.c
index b4dba420f..b4cc785be 100644
--- a/src/adlist.c
+++ b/src/adlist.c
@@ -71,7 +71,7 @@ void listRelease(list *list)
zfree(list);
}
-/* Add a new node to the list, to head, contaning the specified 'value'
+/* Add a new node to the list, to head, containing the specified 'value'
* pointer as value.
*
* On error, NULL is returned and no operation is performed (i.e. the
diff --git a/src/replication.c b/src/replication.c
index 40f33f812..16014c8a9 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -82,7 +82,7 @@ void resizeReplicationBacklog(long long newsize) {
server.repl_backlog = zmalloc(server.repl_backlog_size);
server.repl_backlog_histlen = 0;
server.repl_backlog_idx = 0;
- /* Next byte we have is... the next since the buffer is emtpy. */
+ /* Next byte we have is... the next since the buffer is empty. */
server.repl_backlog_off = server.master_repl_offset+1;
}
}
@@ -376,7 +376,7 @@ int masterTryPartialResynchronization(redisClient *c) {
listAddNodeTail(server.slaves,c);
/* We can't use the connection buffers since they are used to accumulate
* new commands at this stage. But we are sure the socket send buffer is
- * emtpy so this write will never fail actually. */
+ * empty so this write will never fail actually. */
buflen = snprintf(buf,sizeof(buf),"+CONTINUE\r\n");
if (write(c->fd,buf,buflen) != buflen) {
freeClientAsync(c);
@@ -1460,7 +1460,7 @@ void replicationDiscardCachedMaster(void) {
/* Turn the cached master into the current master, using the file descriptor
* passed as argument as the socket for the new master.
*
- * This funciton is called when successfully setup a partial resynchronization
+ * This function is called when successfully setup a partial resynchronization
* so the stream of data that we'll receive will start from were this
* master left. */
void replicationResurrectCachedMaster(int newfd) {
@@ -1750,7 +1750,7 @@ long long replicationGetSlaveOffset(void) {
/* --------------------------- REPLICATION CRON ---------------------------- */
-/* Replication cron funciton, called 1 time per second. */
+/* Replication cron function, called 1 time per second. */
void replicationCron(void) {
/* Non blocking connection timeout? */
if (server.masterhost &&
diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index 78b979469..0ee2a4c90 100644
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -306,7 +306,7 @@ proc signal_idle_client fd {
}
}
-# The the_end funciton gets called when all the test units were already
+# The the_end function gets called when all the test units were already
# executed, so the test finished.
proc the_end {} {
# TODO: print the status, exit with the rigth exit code.