diff --git a/cmake/Modules/ValkeySetup.cmake b/cmake/Modules/ValkeySetup.cmake index 00dd79525..236799d1d 100644 --- a/cmake/Modules/ValkeySetup.cmake +++ b/cmake/Modules/ValkeySetup.cmake @@ -261,17 +261,17 @@ endif () # Sanitizer if (BUILD_SANITIZER) # Common CFLAGS - list(APPEND VALKEY_SANITAIZER_CFLAGS "-fno-sanitize-recover=all") - list(APPEND VALKEY_SANITAIZER_CFLAGS "-fno-omit-frame-pointer") + list(APPEND VALKEY_SANITIZER_CFLAGS "-fno-sanitize-recover=all") + list(APPEND VALKEY_SANITIZER_CFLAGS "-fno-omit-frame-pointer") if ("${BUILD_SANITIZER}" STREQUAL "address") - list(APPEND VALKEY_SANITAIZER_CFLAGS "-fsanitize=address") - list(APPEND VALKEY_SANITAIZER_LDFLAGS "-fsanitize=address") + list(APPEND VALKEY_SANITIZER_CFLAGS "-fsanitize=address") + list(APPEND VALKEY_SANITIZER_LDFLAGS "-fsanitize=address") elseif ("${BUILD_SANITIZER}" STREQUAL "thread") - list(APPEND VALKEY_SANITAIZER_CFLAGS "-fsanitize=thread") - list(APPEND VALKEY_SANITAIZER_LDFLAGS "-fsanitize=thread") + list(APPEND VALKEY_SANITIZER_CFLAGS "-fsanitize=thread") + list(APPEND VALKEY_SANITIZER_LDFLAGS "-fsanitize=thread") elseif ("${BUILD_SANITIZER}" STREQUAL "undefined") - list(APPEND VALKEY_SANITAIZER_CFLAGS "-fsanitize=undefined") - list(APPEND VALKEY_SANITAIZER_LDFLAGS "-fsanitize=undefined") + list(APPEND VALKEY_SANITIZER_CFLAGS "-fsanitize=undefined") + list(APPEND VALKEY_SANITIZER_LDFLAGS "-fsanitize=undefined") else () message(FATAL_ERROR "Unknown sanitizer: ${BUILD_SANITIZER}") endif () diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 61e928106..54824e2c7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,10 +64,10 @@ endif () if (BUILD_SANITIZER) # 'BUILD_SANITIZER' is defined in ValkeySetup module (based on user input) If defined, the variables - # 'VALKEY_SANITAIZER_CFLAGS' and 'VALKEY_SANITAIZER_LDFLAGS' are set with the link & compile flags required + # 'VALKEY_SANITIZER_CFLAGS' and 'VALKEY_SANITIZER_LDFLAGS' are set with the link & compile flags required message(STATUS "Adding sanitizer flags for target valkey-server") - target_compile_options(valkey-server PRIVATE ${VALKEY_SANITAIZER_CFLAGS}) - target_link_options(valkey-server PRIVATE ${VALKEY_SANITAIZER_LDFLAGS}) + target_compile_options(valkey-server PRIVATE ${VALKEY_SANITIZER_CFLAGS}) + target_link_options(valkey-server PRIVATE ${VALKEY_SANITIZER_LDFLAGS}) endif () unset(BUILD_SANITIZER CACHE) diff --git a/src/acl.c b/src/acl.c index 2039ec409..eff13d1a0 100644 --- a/src/acl.c +++ b/src/acl.c @@ -2149,7 +2149,7 @@ static int ACLSelectorCheckKey(aclSelector *selector, const char *key, int keyle return ACL_DENIED_KEY; } -/* Checks if the provided selector selector has access specified in flags +/* Checks if the provided selector has access specified in flags * to all keys in the keyspace. For example, CMD_KEY_READ access requires either * '%R~*', '~*', or allkeys to be granted to the selector. Returns 1 if all * the access flags are satisfied with this selector or 0 otherwise. diff --git a/src/db.c b/src/db.c index 50f9f69db..c9f4099c3 100644 --- a/src/db.c +++ b/src/db.c @@ -1324,7 +1324,7 @@ void scanGenericCommandWithOptions(client *c, robj *o, unsigned long long cursor * 4. data.pattern: the pattern string; * 5. data.sampled: the maxiteration limit is there in case we're * working on an empty dict, one with a lot of empty buckets, and - * for the buckets are not empty, we need to limit the spampled number + * for the buckets are not empty, we need to limit the sampled number * to prevent a long hang time caused by filtering too many keys; * 6. data.only_keys: to control whether values will be returned or * only keys are returned. */ diff --git a/src/replication.c b/src/replication.c index 42aa7b2f1..f5dd76084 100644 --- a/src/replication.c +++ b/src/replication.c @@ -4100,7 +4100,7 @@ int replicaProcessPsyncReply(connection *conn) { if (!strncmp(reply, "+CONTINUE", 9)) { if (server.repl_rdb_channel_state != REPL_DUAL_CHANNEL_STATE_NONE) { - /* During dual channel sync sesseion, primary struct is already initialized. */ + /* During dual channel sync session, primary struct is already initialized. */ sdsfree(reply); return PSYNC_CONTINUE; } diff --git a/src/valkey-cli.c b/src/valkey-cli.c index ebe0c3f49..6b1b5ead4 100644 --- a/src/valkey-cli.c +++ b/src/valkey-cli.c @@ -2441,7 +2441,7 @@ static int cliSendCommand(int argc, char **argv, long repeat) { replicaMode(0); config.replica_mode = 0; zfree(argvlen); - return VALKEY_ERR; /* Error = replilcaMode lost connection to primary */ + return VALKEY_ERR; /* Error = replicaMode lost connection to primary */ } /* Read response, possibly skipping pubsub/push messages. */ diff --git a/src/zmalloc.c b/src/zmalloc.c index e084dc41d..c937ed4a2 100644 --- a/src/zmalloc.c +++ b/src/zmalloc.c @@ -827,7 +827,7 @@ int zmalloc_get_allocator_info(size_t *allocated, size_t *active, size_t *reside je_mallctl("stats.retained", retained, &sz, NULL, 0); } - /* Unlike retained, Muzzy representats memory released with `madvised(..., MADV_FREE)`. + /* Unlike retained, Muzzy represents memory released with `madvised(..., MADV_FREE)`. * These pages will show as RSS for the process, until the OS decides to re-use them. */ if (muzzy) { size_t pmuzzy, page; diff --git a/tests/instances.tcl b/tests/instances.tcl index 356efa0fe..9d6d1e75f 100644 --- a/tests/instances.tcl +++ b/tests/instances.tcl @@ -441,7 +441,7 @@ proc pause_on_error {} { } } elseif {$cmd eq {help}} { puts "ls List Sentinel and Valkey instances." - puts "show-sentinel-logs \[N\] Show latest N lines of logs." + puts "show-sentinel-logs \[N\] Show latest N lines of sentinel logs." puts "show-valkey-logs \[N\] Show latest N lines of logs." puts "S cmd ... arg Call command in Sentinel ." puts "R cmd ... arg Call command in Valkey ." diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl index 8d459401c..0b18f94a5 100644 --- a/tests/integration/replication.tcl +++ b/tests/integration/replication.tcl @@ -638,7 +638,7 @@ start_server {tags {"repl external:skip"} overrides {save {}}} { # to the slave. after 5000 - # Stop the ability of the slave to process data by sendig + # Stop the ability of the slave to process data by sending # a script that will put it in BUSY state. $slave eval {for i=1,3000000000 do end} 0 diff --git a/tests/unit/geo.tcl b/tests/unit/geo.tcl index cfdf4f9f5..cad4f8611 100644 --- a/tests/unit/geo.tcl +++ b/tests/unit/geo.tcl @@ -772,7 +772,7 @@ start_server {tags {"geo"}} { } } - # Make sure this is a real error and not a rounidng issue. + # Make sure this is a real error and not a rounding issue. if {[llength $diff] == $rounding_errors} { set res $res2; # Error silenced }