diff --git a/lib/settings.h b/lib/settings.h index 77b7bff77..5cb4f3411 100644 --- a/lib/settings.h +++ b/lib/settings.h @@ -345,7 +345,7 @@ public: * text mode, e.g. "{file}:{line} {info}" */ std::string templateLocation; - /** @brief The maximum time in seconds for the template instantation */ + /** @brief The maximum time in seconds for the template instantiation */ std::size_t templateMaxTime; /** @brief The maximum time in seconds for the typedef simplification */ diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp index b2960c210..5ad009eda 100644 --- a/lib/templatesimplifier.cpp +++ b/lib/templatesimplifier.cpp @@ -3120,7 +3120,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations( ErrorMessage errmsg({std::move(loc)}, emptyString, Severity::debug, - "Template instantation maximum time exceeded", + "Template instantiation maximum time exceeded", "templateMaxTime", Certainty::normal); mErrorLogger->reportErr(errmsg); @@ -3191,7 +3191,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations( ErrorMessage errmsg({std::move(loc)}, emptyString, Severity::debug, - "Template instantation maximum time exceeded", + "Template instantiation maximum time exceeded", "templateMaxTime", Certainty::normal); mErrorLogger->reportErr(errmsg); diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index 234523c26..77ed03f18 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -624,7 +624,7 @@ void Tokenizer::simplifyTypedef() ErrorMessage errmsg({std::move(loc)}, emptyString, Severity::debug, - "Typedef simplification instantation maximum time exceeded", + "Typedef simplification instantiation maximum time exceeded", "typedefMaxTime", Certainty::normal); mErrorLogger->reportErr(errmsg); diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp index b0f2f22b9..ab2989579 100644 --- a/lib/valueflow.cpp +++ b/lib/valueflow.cpp @@ -602,7 +602,7 @@ static void setTokenValue(Token* tok, const Token* callParent = findParent(parent, [](const Token* p) { return !Token::simpleMatch(p, ","); }); - // Ensure that the comma isnt a function call + // Ensure that the comma isn't a function call if (!callParent || (!Token::Match(callParent->previous(), "%name%|> (") && !Token::simpleMatch(callParent, "{"))) { setTokenValue(parent, std::move(value), settings); return; @@ -5482,7 +5482,7 @@ static void valueFlowForwardConst(Token* start, } return; } - // Follow symbolic vaues + // Follow symbolic values for (const ValueFlow::Value& v : tok->values()) { if (!v.isSymbolicValue()) continue; @@ -9205,7 +9205,7 @@ static std::vector isOutOfBoundsImpl(const ValueFlow::Value& s return {}; if (size.bound == ValueFlow::Value::Bound::Lower) return {}; - // Checking for underflow doesnt mean it could be out of bounds + // Checking for underflow doesn't mean it could be out of bounds if (indexValue->intvalue == 0) return {}; ValueFlow::Value value = inferCondition(">=", indexTok, indexValue->intvalue); diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py index 18e05ec6e..bb1c0755b 100755 --- a/tools/donate-cpu-server.py +++ b/tools/donate-cpu-server.py @@ -1110,7 +1110,7 @@ def read_data(connection, cmd, pos_nl, max_data_size, check_done, cmd_name, time t += 0.2 connection.close() except socket.error as e: - print_ts('Socket error occured ({}): {}'.format(cmd_name, e)) + print_ts('Socket error occurred ({}): {}'.format(cmd_name, e)) data = None if (timeout > 0 and t >= timeout):