From 4dfa2dd552a5cbbaaf028b4709aff068a3c8cb76 Mon Sep 17 00:00:00 2001 From: "Sascha L. Teichmann" Date: Wed, 23 Aug 2023 17:14:49 +0200 Subject: [PATCH] Dedup code a bit --- cmd/csaf_checker/processor.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/cmd/csaf_checker/processor.go b/cmd/csaf_checker/processor.go index b4fc79b..5c1ea61 100644 --- a/cmd/csaf_checker/processor.go +++ b/cmd/csaf_checker/processor.go @@ -1131,18 +1131,19 @@ func (p *processor) checkMissing(string) error { } } // List error in all appropriate categories - if mistake&rolieMask != 0 { - p.badROLIEFeed.error("%s %s", f, strings.Join(where, ", ")) + if mistake&(rolieMask|indexMask|changesMask|listingMask) == 0 { + continue } - if mistake&indexMask != 0 { - p.badIndices.error("%s %s", f, strings.Join(where, ", ")) - } - if mistake&changesMask != 0 { - p.badChanges.error("%s %s", f, strings.Join(where, ", ")) - } - if mistake&listingMask != 0 { - p.badDirListings.error("%s %s", f, strings.Join(where, ", ")) + joined := strings.Join(where, ", ") + report := func(mask whereType, msgs *topicMessages) { + if mistake&mask != 0 { + msgs.error("%s %s", f, joined) + } } + report(rolieMask, &p.badROLIEFeed) + report(indexMask, &p.badIndices) + report(changesMask, &p.badChanges) + report(listingMask, &p.badDirListings) } return nil }