From de1697b467edd9ec2bb0eebb0cee7349f3baa1be Mon Sep 17 00:00:00 2001 From: gtsoul-tech Date: Thu, 30 May 2024 16:40:18 +0300 Subject: [PATCH] deadcode.DeadStores --- src/nfa/mcclellan_common_impl.h | 1 - src/nfa/sheng_impl.h | 2 +- src/nfa/sheng_impl4.h | 8 ++++---- src/rose/program_runtime.c | 4 ++-- unit/hyperscan/expr_info.cpp | 2 +- unit/hyperscan/single.cpp | 4 ++-- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/nfa/mcclellan_common_impl.h b/src/nfa/mcclellan_common_impl.h index 6ec1b1f1..14a71d3f 100644 --- a/src/nfa/mcclellan_common_impl.h +++ b/src/nfa/mcclellan_common_impl.h @@ -134,7 +134,6 @@ u16 doWide16(const char *wide_entry, const u8 **c_inout, const u8 *end, len_c -= 16; } - pos = 0; // at least one in (0, 16). u32 loadLength_w = MIN(len_w, 16); u32 loadLength_c = MIN(len_c, 16); diff --git a/src/nfa/sheng_impl.h b/src/nfa/sheng_impl.h index 2c701446..8b22d810 100644 --- a/src/nfa/sheng_impl.h +++ b/src/nfa/sheng_impl.h @@ -67,7 +67,7 @@ char SHENG_IMPL(u8 *state, NfaCallback cb, void *ctxt, const struct sheng *s, if (unlikely(ACCEPT_FUNC(tmp))) { DEBUG_PRINTF("Accept state %u reached\n", tmp & SHENG_STATE_MASK); - u64a match_offset = base_offset + (cur_buf - buf) + 1; + u64a match_offset = base_offset + (cur_buf - buf) + 1; //NOLINT (clang-analyzer-deadcode.DeadStores) DEBUG_PRINTF("Match @ %llu\n", match_offset); if (STOP_AT_MATCH) { DEBUG_PRINTF("Stopping at match @ %lli\n", diff --git a/src/nfa/sheng_impl4.h b/src/nfa/sheng_impl4.h index 718c3409..d2b3dc35 100644 --- a/src/nfa/sheng_impl4.h +++ b/src/nfa/sheng_impl4.h @@ -129,7 +129,7 @@ char SHENG_IMPL(u8 *state, NfaCallback cb, void *ctxt, const struct sheng *s, if (unlikely(INTERESTING_FUNC(a1, a2, a3, a4))) { if (ACCEPT_FUNC(a1)) { - u64a match_offset = base_offset + b1 - buf; + u64a match_offset = base_offset + b1 - buf; //NOLINT (clang-analyzer-deadcode.DeadStores) DEBUG_PRINTF("Accept state %u reached\n", a1 & SHENG_STATE_MASK); DEBUG_PRINTF("Match @ %llu\n", match_offset); @@ -154,7 +154,7 @@ char SHENG_IMPL(u8 *state, NfaCallback cb, void *ctxt, const struct sheng *s, } } if (ACCEPT_FUNC(a2)) { - u64a match_offset = base_offset + b2 - buf; + u64a match_offset = base_offset + b2 - buf; //NOLINT (clang-analyzer-deadcode.DeadStores) DEBUG_PRINTF("Accept state %u reached\n", a2 & SHENG_STATE_MASK); DEBUG_PRINTF("Match @ %llu\n", match_offset); @@ -179,7 +179,7 @@ char SHENG_IMPL(u8 *state, NfaCallback cb, void *ctxt, const struct sheng *s, } } if (ACCEPT_FUNC(a3)) { - u64a match_offset = base_offset + b3 - buf; + u64a match_offset = base_offset + b3 - buf; //NOLINT (clang-analyzer-deadcode.DeadStores) DEBUG_PRINTF("Accept state %u reached\n", a3 & SHENG_STATE_MASK); DEBUG_PRINTF("Match @ %llu\n", match_offset); @@ -204,7 +204,7 @@ char SHENG_IMPL(u8 *state, NfaCallback cb, void *ctxt, const struct sheng *s, } } if (ACCEPT_FUNC(a4)) { - u64a match_offset = base_offset + b4 - buf; + u64a match_offset = base_offset + b4 - buf; //NOLINT (clang-analyzer-deadcode.DeadStores) DEBUG_PRINTF("Accept state %u reached\n", a4 & SHENG_STATE_MASK); DEBUG_PRINTF("Match @ %llu\n", match_offset); diff --git a/src/rose/program_runtime.c b/src/rose/program_runtime.c index 87dc0c4d..bedc8264 100644 --- a/src/rose/program_runtime.c +++ b/src/rose/program_runtime.c @@ -2991,7 +2991,7 @@ hwlmcb_rv_t roseRunProgram(const struct RoseEngine *t, pc = getByOffset(t, ri->child_offset); pc_base = pc; - programOffset = (const u8 *)pc_base -(const u8 *)t; + programOffset = (const u8 *)pc_base -(const u8 *)t; //NOLINT (clang-analyzer-deadcode.DeadStores) DEBUG_PRINTF("pc_base %p pc %p child_offset %u squash %u\n", pc_base, pc, ri->child_offset, ri->squash); work_done = 0; @@ -3428,7 +3428,7 @@ hwlmcb_rv_t roseRunProgram_l(const struct RoseEngine *t, pc = getByOffset(t, ri->child_offset); pc_base = pc; - programOffset = (const u8 *)pc_base -(const u8 *)t; + programOffset = (const u8 *)pc_base -(const u8 *)t; //NOLINT (clang-analyzer-deadcode.DeadStores) DEBUG_PRINTF("pc_base %p pc %p child_offset %u squash %u\n", pc_base, pc, ri->child_offset, ri->squash); work_done = 0; diff --git a/unit/hyperscan/expr_info.cpp b/unit/hyperscan/expr_info.cpp index 0ea8bce5..647714e2 100644 --- a/unit/hyperscan/expr_info.cpp +++ b/unit/hyperscan/expr_info.cpp @@ -89,7 +89,7 @@ ostream& operator<<(ostream &os, const hs_expr_ext &ext) { os << ", "; } os << "hamming_distance=" << ext.hamming_distance; - first = false; + //first = false; } return os; } diff --git a/unit/hyperscan/single.cpp b/unit/hyperscan/single.cpp index 278d28f7..3f916c91 100644 --- a/unit/hyperscan/single.cpp +++ b/unit/hyperscan/single.cpp @@ -571,7 +571,7 @@ TEST_P(HyperscanTestMatchTerminate, StreamWhole) { terminateHandler, &count); ASSERT_TRUE(err == HS_SUCCESS || err == HS_SCAN_TERMINATED); - err = hs_close_stream(stream, scratch, terminateHandler, &count); + hs_close_stream(stream, scratch, terminateHandler, &count); ASSERT_EQ(1, count) << "Number of matches returned was not 1."; err = hs_free_scratch(scratch); @@ -600,7 +600,7 @@ TEST_P(HyperscanTestMatchTerminate, StreamByteByByte) { ASSERT_TRUE(err == HS_SUCCESS || err == HS_SCAN_TERMINATED); } - err = hs_close_stream(stream, scratch, terminateHandler, &count); + hs_close_stream(stream, scratch, terminateHandler, &count); ASSERT_EQ(1, count) << "Number of matches returned was not 1."; err = hs_free_scratch(scratch);