github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

ddressing some cppcheck warnings. yes this will be cleaned up in a

Browse Source 
following commit. tests pass.
This commit is contained in:
G.E 2024-04-23 19:08:24 +03:00
parent 6e306a508e
commit 01dee390a9
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/benchmarks.cpp
View File

@ -113,7 +113,7 @@ static void run_benchmarks(int size, int loops, int max_matches, bool is_reverse
auto end = std::chrono::steady_clock::now();
total_sec += std::chrono::duration_cast<std::chrono::microseconds>(end - start).count();
/*calculate transferred size*/
total_size = size * loops;
total_size = (u64a)size * (u64a)loops;
/*calculate average time*/
avg_time = total_sec / loops;
/*convert microseconds to seconds*/

3
src/nfagraph/ng.cpp
View File

@ -193,9 +193,6 @@ void reduceGraph(NGHolder &g, som_type som, bool utf8,
if (!som) {
mergeCyclicDotStars(g);
}
if (!som) {
removeSiblingsOfStartDotStar(g);
}
}

4
src/nfagraph/ng_limex_accel.cpp
View File

@ -811,11 +811,11 @@ depth_done:
return true;
}
}
}
// }
// Second option: a two-byte shufti (i.e. less than eight 2-byte
// literals)
if (depth > 1) {
// if (depth > 1) {
for (unsigned int i = 0; i < (depth - 1); i++) {
if (depthReach[i].count() * depthReach[i+1].count()
<= DOUBLE_SHUFTI_LIMIT) {

23
src/nfagraph/ng_som_util.cpp
View File

@ -267,17 +267,18 @@ bool somMayGoBackwards(NFAVertex u, const NGHolder &g,
boost::depth_first_search(c_g, visitor(backEdgeVisitor)
.root_vertex(c_g.start));
for (const auto &e : be) {
NFAVertex s = source(e, c_g);
NFAVertex t = target(e, c_g);
DEBUG_PRINTF("back edge %zu %zu\n", c_g[s].index, c_g[t].index);
if (s != t) {
assert(0);
DEBUG_PRINTF("eek big cycle\n");
rv = true; /* big cycle -> eek */
goto exit;
}
}
// with be.clear right above does this ever run at all?
//for (const auto &e : be) {
// NFAVertex s = source(e, c_g);
// NFAVertex t = target(e, c_g);
// DEBUG_PRINTF("back edge %zu %zu\n", c_g[s].index, c_g[t].index);
// if (s != t) {
// assert(0);
// DEBUG_PRINTF("eek big cycle\n");
// rv = true; /* big cycle -> eek */
// goto exit;
// }
//}
DEBUG_PRINTF("checking acyclic+selfloop graph\n");

6
src/rose/rose_build_bytecode.cpp
View File

@ -2975,7 +2975,8 @@ void buildFragmentPrograms(const RoseBuildImpl &build,
!lit_prog.empty()) {
auto &cfrag = fragments[pfrag.included_frag_id];
assert(pfrag.s.length() >= cfrag.s.length() &&
!pfrag.s.any_nocase() >= !cfrag.s.any_nocase());
!pfrag.s.any_nocase() == !cfrag.s.any_nocase());
/** !pfrag.s.any_nocase() >= !cfrag.s.any_nocase()); **/
u32 child_offset = cfrag.lit_program_offset;
DEBUG_PRINTF("child %u offset %u\n", cfrag.fragment_id,
child_offset);
@ -2993,7 +2994,8 @@ void buildFragmentPrograms(const RoseBuildImpl &build,
if (pfrag.included_delay_frag_id != INVALID_FRAG_ID &&
!rebuild_prog.empty()) {
auto &cfrag = fragments[pfrag.included_delay_frag_id];
assert(pfrag.s.length() >= cfrag.s.length() &&
/** assert(pfrag.s.length() >= cfrag.s.length() && **/
assert(pfrag.s.length() == cfrag.s.length() &&
!pfrag.s.any_nocase() >= !cfrag.s.any_nocase());
u32 child_offset = cfrag.delay_program_offset;
DEBUG_PRINTF("child %u offset %u\n", cfrag.fragment_id,

2
src/rose/rose_build_castle.cpp
View File

@ -170,7 +170,7 @@ void renovateCastle(RoseBuildImpl &tbi, CastleProto *castle,
return; /* bail - TODO: be less lazy */
}
vector<CharReach> rem_local_cr;
//vector<CharReach> rem_local_cr;
u32 ok_count = 0;
for (auto it = e.s.end() - g[v].left.lag; it != e.s.end(); ++it) {
if (!isSubsetOf(*it, cr)) {

2
tools/hscheck/main.cpp
View File

@ -97,7 +97,7 @@ unsigned int countFailures = 0;
class ParsedExpr {
public:
ParsedExpr(string regex_in, unsigned int flags_in, hs_expr_ext ext_in)
ParsedExpr(string regex_in, unsigned int flags_in, hs_expr_ext& ext_in)
: regex(regex_in), flags(flags_in), ext(ext_in) {}
~ParsedExpr() {}
string regex;

2
util/ExpressionParser.rl
View File

@ -152,7 +152,7 @@ bool HS_CDECL readExpression(const std::string &input, std::string &expr,
UNUSED const char *eof = pe;
UNUSED const char *ts = p, *te = p;
int cs;
UNUSED int act;
//UNUSED int act;
assert(p);
assert(pe);

2
util/ng_corpus_generator.h
View File

@ -47,7 +47,7 @@ class NGHolder;
} // namespace ue2
struct CorpusGenerationFailure {
explicit CorpusGenerationFailure(const std::string s) :
explicit CorpusGenerationFailure(const std::string& s) :
message(std::move(s)) {}
std::string message;
};