SystemSh0cker/gocsaf
1
0
Fork 0
mirror of https://github.com/gocsaf/csaf.git synced 2025-12-22 11:55:40 +01:00
Code Issues Releases Activity Actions

Use whereType for mistake

Browse source
This commit is contained in:
JanHoefelmeyer 2023-08-23 12:58:40 +02:00
parent 4b56f3e837
commit 8d51577e49
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cmd/csaf_checker/processor.go
View file

@ -1116,7 +1116,7 @@ func (p *processor) checkMissing(string) error {
v := p.alreadyChecked[f] v := p.alreadyChecked[f]
var where []string var where []string
// mistake contains which requirements are broken // mistake contains which requirements are broken
mistake := util.Set[whereType]{} var mistake whereType
for mask := rolieMask; mask <= listingMask; mask <<= 1 { for mask := rolieMask; mask <= listingMask; mask <<= 1 {
if maxMask&mask == mask { if maxMask&mask == mask {
var in string var in string
@ -1125,26 +1125,29 @@ func (p *processor) checkMissing(string) error {
} else { } else {
in = "not in" in = "not in"
// Which file is missing entries? // Which file is missing entries?
mistake.Add(mask) mistake |= mask
} }
where = append(where, in+" "+mask.String()) where = append(where, in+" "+mask.String())
} }
} }
// List error in all appropriate categories // List error in all appropriate categories
if mistake.Contains(rolieMask) { if mistake&rolieMask != 0 {
p.badROLIEFeed.error("%s %s", f, strings.Join(where, ", ")) p.badROLIEFeed.error("%s %s", f, strings.Join(where, ", "))
} }
if mistake.Contains(indexMask) { if mistake&indexMask != 0 {
p.badIndices.error("%s %s", f, strings.Join(where, ", ")) p.badIndices.error("%s %s", f, strings.Join(where, ", "))
} }
if mistake.Contains(changesMask) { if mistake&changesMask != 0 {
p.badChanges.error("%s %s", f, strings.Join(where, ", ")) p.badChanges.error("%s %s", f, strings.Join(where, ", "))
} }
if mistake.Contains(listingMask) { if mistake&listingMask != 0 {
p.badDirListings.error("%s %s", f, strings.Join(where, ", ")) p.badDirListings.error("%s %s", f, strings.Join(where, ", "))
} }
// reset mistake // reset mistake
mistake = nil mistake &= rolieMask
mistake &= indexMask
mistake &= changesMask
mistake &= listingMask
} }
return nil return nil
} }