From b79dfafefbccecae36d4bab44f10a7eea8bad07b Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 23 Oct 2022 16:00:53 -0400 Subject: [PATCH 1/4] spelling: algorithm Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/analyzer/protocol/login/NVT.cc | 2 +- src/probabilistic/CardinalityCounter.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/analyzer/protocol/login/NVT.cc b/src/analyzer/protocol/login/NVT.cc index 80f35eabe0..c47e5dd615 100644 --- a/src/analyzer/protocol/login/NVT.cc +++ b/src/analyzer/protocol/login/NVT.cc @@ -139,7 +139,7 @@ void TelnetTerminalOption::RecvSubOption(u_char* data, int len) } #define ENCRYPT_SET_ALGORITHM 0 -#define ENCRYPT_SUPPORT_ALGORITM 1 +#define ENCRYPT_SUPPORT_ALGORITHM 1 #define ENCRYPT_REPLY 2 #define ENCRYPT_STARTING_TO_ENCRYPT 3 #define ENCRYPT_NO_LONGER_ENCRYPTING 4 diff --git a/src/probabilistic/CardinalityCounter.cc b/src/probabilistic/CardinalityCounter.cc index 8a58c4b25e..c30c2be171 100644 --- a/src/probabilistic/CardinalityCounter.cc +++ b/src/probabilistic/CardinalityCounter.cc @@ -36,7 +36,7 @@ void CardinalityCounter::Init(uint64_t size) m = size; // The following magic values are taken directly out of the - // description of the HyperLogLog algorithn. + // description of the HyperLogLog algorithm. if ( m == 16 ) alpha_m = 0.673; From 34966a93ef1b292dbcfbd47d816bd6b27627e53a Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 23 Oct 2022 16:01:22 -0400 Subject: [PATCH 2/4] spelling: canonicalize Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Expr.cc | 16 ++++++++-------- src/Expr.h | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Expr.cc b/src/Expr.cc index 318d9369cb..6503feddb4 100644 --- a/src/Expr.cc +++ b/src/Expr.cc @@ -452,7 +452,7 @@ void Expr::AddTag(ODesc* d) const d->AddSP(expr_name(Tag())); } -void Expr::Canonicize() { } +void Expr::Canonicalize() { } void Expr::SetType(TypePtr t) { @@ -1670,7 +1670,7 @@ AddExpr::AddExpr(ExprPtr arg_op1, ExprPtr arg_op2) } } -void AddExpr::Canonicize() +void AddExpr::Canonicalize() { if ( expr_greater(op2.get(), op1.get()) || (op1->GetType()->Tag() == TYPE_INTERVAL && op2->GetType()->Tag() == TYPE_TIME) || @@ -1902,7 +1902,7 @@ TimesExpr::TimesExpr(ExprPtr arg_op1, ExprPtr arg_op2) if ( IsError() ) return; - Canonicize(); + Canonicalize(); TypeTag bt1 = op1->GetType()->Tag(); @@ -1929,7 +1929,7 @@ TimesExpr::TimesExpr(ExprPtr arg_op1, ExprPtr arg_op2) CheckScalarAggOp(); } -void TimesExpr::Canonicize() +void TimesExpr::Canonicalize() { if ( expr_greater(op2.get(), op1.get()) || op2->GetType()->Tag() == TYPE_INTERVAL || (op2->IsConst() && ! is_vector(op2->ExprVal()) && ! op1->IsConst()) ) @@ -2247,7 +2247,7 @@ EqExpr::EqExpr(ExprTag arg_tag, ExprPtr arg_op1, ExprPtr arg_op2) if ( IsError() ) return; - Canonicize(); + Canonicalize(); const auto& t1 = op1->GetType(); const auto& t2 = op2->GetType(); @@ -2317,7 +2317,7 @@ EqExpr::EqExpr(ExprTag arg_tag, ExprPtr arg_op1, ExprPtr arg_op2) CheckScalarAggOp(); } -void EqExpr::Canonicize() +void EqExpr::Canonicalize() { if ( op2->GetType()->Tag() == TYPE_PATTERN ) SwapOps(); @@ -2362,7 +2362,7 @@ RelExpr::RelExpr(ExprTag arg_tag, ExprPtr arg_op1, ExprPtr arg_op2) if ( IsError() ) return; - Canonicize(); + Canonicalize(); const auto& t1 = op1->GetType(); const auto& t2 = op2->GetType(); @@ -2399,7 +2399,7 @@ RelExpr::RelExpr(ExprTag arg_tag, ExprPtr arg_op1, ExprPtr arg_op2) CheckScalarAggOp(); } -void RelExpr::Canonicize() +void RelExpr::Canonicalize() { if ( tag == EXPR_GT ) { diff --git a/src/Expr.h b/src/Expr.h index 9cffbabd3f..6db42007e4 100644 --- a/src/Expr.h +++ b/src/Expr.h @@ -426,7 +426,7 @@ protected: void AddTag(ODesc* d) const; // Puts the expression in canonical form. - virtual void Canonicize(); + virtual void Canonicalize(); void SetType(TypePtr t); @@ -747,7 +747,7 @@ class AddExpr final : public BinaryExpr { public: AddExpr(ExprPtr op1, ExprPtr op2); - void Canonicize() override; + void Canonicalize() override; // Optimization-related: ExprPtr Duplicate() override; @@ -809,7 +809,7 @@ class TimesExpr final : public BinaryExpr { public: TimesExpr(ExprPtr op1, ExprPtr op2); - void Canonicize() override; + void Canonicalize() override; // Optimization-related: ExprPtr Duplicate() override; @@ -874,7 +874,7 @@ class EqExpr final : public BinaryExpr { public: EqExpr(ExprTag tag, ExprPtr op1, ExprPtr op2); - void Canonicize() override; + void Canonicalize() override; // Optimization-related: ExprPtr Duplicate() override; @@ -890,7 +890,7 @@ class RelExpr final : public BinaryExpr { public: RelExpr(ExprTag tag, ExprPtr op1, ExprPtr op2); - void Canonicize() override; + void Canonicalize() override; // Optimization-related: ExprPtr Duplicate() override; From 90f1da4fe70b491c403132dc9861829581207f80 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 23 Oct 2022 17:57:16 -0400 Subject: [PATCH 3/4] spelling: deterministic Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/util.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/util.cc b/src/util.cc index 5530488e19..bbb0be151e 100644 --- a/src/util.cc +++ b/src/util.cc @@ -380,7 +380,7 @@ static bool write_random_seeds(const char* write_file, uint32_t seed, return true; } -static bool zeek_rand_determistic = false; +static bool zeek_rand_deterministic = false; static long int zeek_rand_state = 0; static bool first_seed_saved = false; static unsigned int first_seed = 0; @@ -388,14 +388,14 @@ static unsigned int first_seed = 0; static void zeek_srandom(unsigned int seed, bool deterministic) { zeek_rand_state = seed == 0 ? 1 : seed; - zeek_rand_determistic = deterministic; + zeek_rand_deterministic = deterministic; srandom(seed); } void seed_random(unsigned int seed) { - if ( zeek_rand_determistic ) + if ( zeek_rand_deterministic ) zeek_rand_state = seed == 0 ? 1 : seed; else srandom(seed); @@ -493,7 +493,7 @@ unsigned int initial_seed() bool have_random_seed() { - return zeek_rand_determistic; + return zeek_rand_deterministic; } constexpr uint32_t zeek_prng_mod = 2147483647; @@ -501,7 +501,7 @@ constexpr uint32_t zeek_prng_max = zeek_prng_mod - 1; long int max_random() { - return zeek_rand_determistic ? zeek_prng_max : RAND_MAX; + return zeek_rand_deterministic ? zeek_prng_max : RAND_MAX; } long int prng(long int state) @@ -529,7 +529,7 @@ long int prng(long int state) long int random_number() { - if ( ! zeek_rand_determistic ) + if ( ! zeek_rand_deterministic ) return random(); // Use system PRNG. zeek_rand_state = detail::prng(zeek_rand_state); @@ -2120,7 +2120,7 @@ uint64_t calculate_unique_id(size_t pool) ++uid_instance; // Now it's larger than zero. } else - // Generate determistic UIDs for each individual pool. + // Generate deterministic UIDs for each individual pool. uid_instance = pool; // Our instance is unique. Huzzah. From 6f30f8df7ceb8824f38f611d6f76347237810f04 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 23 Oct 2022 16:03:56 -0400 Subject: [PATCH 4/4] spelling: successful Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/analyzer/protocol/pop3/POP3.cc | 6 +++--- src/analyzer/protocol/pop3/POP3.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/analyzer/protocol/pop3/POP3.cc b/src/analyzer/protocol/pop3/POP3.cc index 602cb89214..501cecaa56 100644 --- a/src/analyzer/protocol/pop3/POP3.cc +++ b/src/analyzer/protocol/pop3/POP3.cc @@ -676,7 +676,7 @@ void POP3_Analyzer::ProcessReply(int length, const char* line) case detail::DELE: case detail::XSENDER: if ( masterState == detail::POP3_AUTHORIZATION ) - AuthSuccessfull(); + AuthSuccessful(); masterState = detail::POP3_TRANSACTION; break; @@ -689,7 +689,7 @@ void POP3_Analyzer::ProcessReply(int length, const char* line) if ( waitingForAuthentication ) masterState = detail::POP3_TRANSACTION; waitingForAuthentication = false; - AuthSuccessfull(); + AuthSuccessful(); break; case detail::TOP: @@ -819,7 +819,7 @@ void POP3_Analyzer::StartTLS() EnqueueConnEvent(pop3_starttls, ConnVal()); } -void POP3_Analyzer::AuthSuccessfull() +void POP3_Analyzer::AuthSuccessful() { if ( user.size() ) POP3Event(pop3_login_success, false, user.c_str(), password.c_str()); diff --git a/src/analyzer/protocol/pop3/POP3.h b/src/analyzer/protocol/pop3/POP3.h index 8628b29a70..9e4317e1a7 100644 --- a/src/analyzer/protocol/pop3/POP3.h +++ b/src/analyzer/protocol/pop3/POP3.h @@ -108,7 +108,7 @@ protected: std::vector TokenizeLine(const std::string& input, char split); int ParseCmd(std::string cmd); - void AuthSuccessfull(); + void AuthSuccessful(); void POP3Event(EventHandlerPtr event, bool is_orig, const char* arg1 = nullptr, const char* arg2 = nullptr);