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 'origin/topic/awelzel/id-opt-info-branch-clone-no-lint'

Browse source 
* origin/topic/awelzel/id-opt-info-branch-clone-no-lint:
  script_opt/IDOptInfo: Add NOLINT(bugprone-branch-clone)
This commit is contained in:
Arne Welzel 2025-07-07 20:07:30 +02:00
commit 3c941a6d3e
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
8.0.0-dev.601 | 2025-07-07 20:07:30 +0200
* script_opt/IDOptInfo: Add NOLINT(bugprone-branch-clone) (Arne Welzel, Corelight)
8.0.0-dev.599 | 2025-07-07 18:17:15 +0200 8.0.0-dev.599 | 2025-07-07 18:17:15 +0200
* Bump zeekjs to v0.18.0 (Arne Welzel, Corelight) * Bump zeekjs to v0.18.0 (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.599 8.0.0-dev.601

2
src/script_opt/IDOptInfo.cc
View file

@ -456,7 +456,7 @@ int IDOptInfo::FindRegionBeforeIndex(int stmt_num) {
// or // or
// It's active at the beginning of the statement of interest. // It's active at the beginning of the statement of interest.
if ( ur.EndsAfter() == NO_DEF || ur.EndsAfter() >= stmt_num ) if ( ur.EndsAfter() == NO_DEF || ur.EndsAfter() >= stmt_num )
region_ind = i; region_ind = i; // NOLINT(bugprone-branch-clone)
else if ( ur.EndsAfter() == stmt_num - 1 && ur.EndedDueToAssignment() ) { else if ( ur.EndsAfter() == stmt_num - 1 && ur.EndedDueToAssignment() ) {
// There's one other possibility, which occurs for a series of // There's one other possibility, which occurs for a series of