Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'jsoref/spelling-expr'

Browse source 
* jsoref/spelling-expr:
  spelling: successful
  spelling: deterministic
  spelling: canonicalize
  spelling: algorithm
This commit is contained in:
Tim Wojtulewicz 2022-11-09 18:17:10 -07:00
commit a85f1044eb
8 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
5.2.0-dev.215
5.2.0-dev.220

16
src/Expr.cc
View file

@ -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 )
{

10
src/Expr.h
View file

@ -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;

2
src/analyzer/protocol/login/NVT.cc
View file

@ -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

6
src/analyzer/protocol/pop3/POP3.cc
View file

@ -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());

2
src/analyzer/protocol/pop3/POP3.h
View file

@ -108,7 +108,7 @@ protected:
std::vector<std::string> 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);

2
src/probabilistic/CardinalityCounter.cc
View file

@ -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;

14
src/util.cc
View file

@ -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.