Skip to content
This repository was archived by the owner on Jul 11, 2021. It is now read-only.

Commit 6ff8b72

Browse files
badboymattsta
authored andcommitted
Fix many small typos
Closes redis#1871
1 parent d8a3d17 commit 6ff8b72

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/aof.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void aofRewriteBufferReset(void) {
7474
listSetFreeMethod(server.aof_rewrite_buf_blocks,zfree);
7575
}
7676

77-
/* Return the current size of the AOF rerwite buffer. */
77+
/* Return the current size of the AOF rewite buffer. */
7878
unsigned long aofRewriteBufferSize(void) {
7979
listNode *ln;
8080
listIter li;
@@ -241,7 +241,7 @@ int startAppendOnly(void) {
241241
redisLog(REDIS_WARNING,"Redis needs to enable the AOF but can't trigger a background AOF rewrite operation. Check the above logs for more info about the error.");
242242
return REDIS_ERR;
243243
}
244-
/* We correctly switched on AOF, now wait for the rerwite to be complete
244+
/* We correctly switched on AOF, now wait for the rewite to be complete
245245
* in order to append data on disk. */
246246
server.aof_state = REDIS_AOF_WAIT_REWRITE;
247247
return REDIS_OK;
@@ -282,7 +282,7 @@ void flushAppendOnlyFile(int force) {
282282
* the write for a couple of seconds. */
283283
if (sync_in_progress) {
284284
if (server.aof_flush_postponed_start == 0) {
285-
/* No previous write postponinig, remember that we are
285+
/* No previous write postponing, remember that we are
286286
* postponing the flush and return. */
287287
server.aof_flush_postponed_start = server.unixtime;
288288
return;
@@ -333,7 +333,7 @@ void flushAppendOnlyFile(int force) {
333333
last_write_error_log = server.unixtime;
334334
}
335335

336-
/* Lof the AOF write error and record the error code. */
336+
/* Log the AOF write error and record the error code. */
337337
if (nwritten == -1) {
338338
if (can_log) {
339339
redisLog(REDIS_WARNING,"Error writing to the AOF file: %s",
@@ -357,7 +357,7 @@ void flushAppendOnlyFile(int force) {
357357
"ftruncate: %s", strerror(errno));
358358
}
359359
} else {
360-
/* If the ftrunacate() succeeded we can set nwritten to
360+
/* If the ftruncate() succeeded we can set nwritten to
361361
* -1 since there is no longer partial data into the AOF. */
362362
nwritten = -1;
363363
}
@@ -369,7 +369,7 @@ void flushAppendOnlyFile(int force) {
369369
/* We can't recover when the fsync policy is ALWAYS since the
370370
* reply for the client is already in the output buffers, and we
371371
* have the contract with the user that on acknowledged write data
372-
* is synched on disk. */
372+
* is synced on disk. */
373373
redisLog(REDIS_WARNING,"Can't recover from AOF write error when the AOF fsync policy is 'always'. Exiting...");
374374
exit(1);
375375
} else {
@@ -464,7 +464,7 @@ sds catAppendOnlyExpireAtCommand(sds buf, struct redisCommand *cmd, robj *key, r
464464
long long when;
465465
robj *argv[3];
466466

467-
/* Make sure we can use strtol */
467+
/* Make sure we can use strtoll */
468468
seconds = getDecodedObject(seconds);
469469
when = strtoll(seconds->ptr,NULL,10);
470470
/* Convert argument into milliseconds for EXPIRE, SETEX, EXPIREAT */
@@ -495,7 +495,7 @@ void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv, int a
495495
robj *tmpargv[3];
496496

497497
/* The DB this command was targeting is not the same as the last command
498-
* we appendend. To issue a SELECT command is needed. */
498+
* we appended. To issue a SELECT command is needed. */
499499
if (dictid != server.aof_selected_db) {
500500
char seldb[64];
501501

@@ -944,7 +944,7 @@ int rewriteHashObject(rio *r, robj *key, robj *o) {
944944
* the difference accumulated from the parent into a buffer, that is
945945
* concatenated at the end of the rewrite. */
946946
ssize_t aofReadDiffFromParent(void) {
947-
char buf[65536]; /* Default pipe buffer size on most Linux sytems. */
947+
char buf[65536]; /* Default pipe buffer size on most Linux systems. */
948948
ssize_t nread, total = 0;
949949

950950
while ((nread =
@@ -1058,7 +1058,7 @@ int rewriteAppendOnlyFile(char *filename) {
10581058

10591059
/* Read again a few times to get more data from the parent.
10601060
* We can't read forever (the server may receive data from clients
1061-
* fater than it is able to send data to the child), so we try to read
1061+
* faster than it is able to send data to the child), so we try to read
10621062
* some more data in a loop as soon as there is a good chance more data
10631063
* will come. If it looks like we are wasting time, we abort (this
10641064
* happens after 20 ms without new data). */
@@ -1191,7 +1191,7 @@ void aofClosePipes(void) {
11911191
}
11921192

11931193
/* ----------------------------------------------------------------------------
1194-
* AOF backgorund rewrite
1194+
* AOF background rewrite
11951195
* ------------------------------------------------------------------------- */
11961196

11971197
/* This is how rewriting of the append only file in background works:
@@ -1333,7 +1333,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
13331333
latencyAddSampleIfNeeded("aof-rewrite-diff-write",latency);
13341334

13351335
redisLog(REDIS_NOTICE,
1336-
"Redidual parent diff successfully flushed to the rewritten AOF (%.2f MB)", (double) aofRewriteBufferSize() / (1024*1024));
1336+
"Residual parent diff successfully flushed to the rewritten AOF (%.2f MB)", (double) aofRewriteBufferSize() / (1024*1024));
13371337

13381338
/* The only remaining thing to do is to rename the temporary file to
13391339
* the configured file and switch the file descriptor used to do AOF

0 commit comments

Comments
 (0)