From ed84aeb30017650f1b8621814903b9f36f679ea3 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 3 Mar 2026 10:17:01 -0500 Subject: [PATCH] yet more staticcheck --- Makefile | 2 +- pkg/transformers/altkv.go | 6 +++--- pkg/transformers/check.go | 1 - pkg/transformers/group_by.go | 1 - pkg/transformers/group_like.go | 1 - pkg/transformers/label.go | 1 - pkg/transformers/latin1_to_utf8.go | 1 - pkg/transformers/nothing.go | 1 - pkg/transformers/regularize.go | 1 - pkg/transformers/remove_empty_columns.go | 1 - pkg/transformers/sec2gmtdate.go | 1 - pkg/transformers/shuffle.go | 1 - pkg/transformers/skip_trivial_records.go | 1 - pkg/transformers/tac.go | 1 - pkg/transformers/utf8_to_latin1.go | 1 - 15 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 3e13f56ed..e9a1a1a56 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ fmt format: # Needs first: go install honnef.co/go/tools/cmd/staticcheck@latest # See also: https://staticcheck.io staticcheck: - staticcheck ./... + staticcheck ./pkg/... ./cmd/mlr/... # ---------------------------------------------------------------- # For developers before pushing to GitHub. diff --git a/pkg/transformers/altkv.go b/pkg/transformers/altkv.go index aba0c87ed..7e6da04cc 100644 --- a/pkg/transformers/altkv.go +++ b/pkg/transformers/altkv.go @@ -54,10 +54,10 @@ func transformerAltkvParseCLI( if opt == "-h" || opt == "--help" { transformerAltkvUsage(os.Stdout) return nil, cli.ErrHelpRequested + } else { + transformerAltkvUsage(os.Stderr) + return nil, fmt.Errorf("%s %s: option \"%s\" not recognized", "mlr", verbNameAltkv, opt) } - transformerAltkvUsage(os.Stderr) - //lint:ignore SA4004 loop is intentionally structured this way - return nil, fmt.Errorf("%s %s: option \"%s\" not recognized", "mlr", verbNameAltkv, opt) } *pargi = argi diff --git a/pkg/transformers/check.go b/pkg/transformers/check.go index 34d5678a2..46e291b15 100644 --- a/pkg/transformers/check.go +++ b/pkg/transformers/check.go @@ -59,7 +59,6 @@ func transformerCheckParseCLI( return nil, cli.ErrHelpRequested } else { - //lint:ignore SA4004 loop is intentionally structured this way return nil, cli.VerbErrorf(verbNameCheck, "option \"%s\" not recognized", opt) } } diff --git a/pkg/transformers/group_by.go b/pkg/transformers/group_by.go index 0fac12018..e4d704c03 100644 --- a/pkg/transformers/group_by.go +++ b/pkg/transformers/group_by.go @@ -55,7 +55,6 @@ func transformerGroupByParseCLI( return nil, cli.ErrHelpRequested } else { - //lint:ignore SA4004 loop is intentionally structured this way return nil, cli.VerbErrorf(verbNameGroupBy, "option \"%s\" not recognized", opt) } } diff --git a/pkg/transformers/group_like.go b/pkg/transformers/group_like.go index 1d630b434..a47d224e9 100644 --- a/pkg/transformers/group_like.go +++ b/pkg/transformers/group_like.go @@ -55,7 +55,6 @@ func transformerGroupLikeParseCLI( return nil, cli.ErrHelpRequested } else { - //lint:ignore SA4004 loop is intentionally structured this way return nil, cli.VerbErrorf(verbNameGroupLike, "option \"%s\" not recognized", opt) } } diff --git a/pkg/transformers/label.go b/pkg/transformers/label.go index ef7542b72..3113cd449 100644 --- a/pkg/transformers/label.go +++ b/pkg/transformers/label.go @@ -59,7 +59,6 @@ func transformerLabelParseCLI( return nil, cli.ErrHelpRequested } else { - //lint:ignore SA4004 loop is intentionally structured this way return nil, cli.VerbErrorf(verbNameLabel, "option \"%s\" not recognized", opt) } } diff --git a/pkg/transformers/latin1_to_utf8.go b/pkg/transformers/latin1_to_utf8.go index 568cd405a..30befec45 100644 --- a/pkg/transformers/latin1_to_utf8.go +++ b/pkg/transformers/latin1_to_utf8.go @@ -57,7 +57,6 @@ func transformerLatin1ToUTF8ParseCLI( return nil, cli.ErrHelpRequested } else { - //lint:ignore SA4004 loop is intentionally structured this way return nil, cli.VerbErrorf(verbNameLatin1ToUTF8, "option \"%s\" not recognized", opt) } } diff --git a/pkg/transformers/nothing.go b/pkg/transformers/nothing.go index 2e5b95a8c..460f25f2f 100644 --- a/pkg/transformers/nothing.go +++ b/pkg/transformers/nothing.go @@ -55,7 +55,6 @@ func transformerNothingParseCLI( return nil, cli.ErrHelpRequested } else { transformerNothingUsage(os.Stderr) - //lint:ignore SA4004 loop is intentionally structured this way return nil, fmt.Errorf("%s %s: option \"%s\" not recognized", "mlr", verbNameNothing, opt) } } diff --git a/pkg/transformers/regularize.go b/pkg/transformers/regularize.go index 92317c75e..61ca19ee0 100644 --- a/pkg/transformers/regularize.go +++ b/pkg/transformers/regularize.go @@ -56,7 +56,6 @@ func transformerRegularizeParseCLI( return nil, cli.ErrHelpRequested } else { - //lint:ignore SA4004 loop is intentionally structured this way return nil, cli.VerbErrorf(verbNameRegularize, "option \"%s\" not recognized", opt) } } diff --git a/pkg/transformers/remove_empty_columns.go b/pkg/transformers/remove_empty_columns.go index 71c26423f..c148358df 100644 --- a/pkg/transformers/remove_empty_columns.go +++ b/pkg/transformers/remove_empty_columns.go @@ -55,7 +55,6 @@ func transformerRemoveEmptyColumnsParseCLI( return nil, cli.ErrHelpRequested } else { - //lint:ignore SA4004 loop is intentionally structured this way return nil, cli.VerbErrorf(verbNameRemoveEmptyColumns, "option \"%s\" not recognized", opt) } } diff --git a/pkg/transformers/sec2gmtdate.go b/pkg/transformers/sec2gmtdate.go index 942cbe349..77c50bf23 100644 --- a/pkg/transformers/sec2gmtdate.go +++ b/pkg/transformers/sec2gmtdate.go @@ -58,7 +58,6 @@ func transformerSec2GMTDateParseCLI( return nil, cli.ErrHelpRequested } else { - //lint:ignore SA4004 loop is intentionally structured this way return nil, cli.VerbErrorf(verbNameSec2GMTDate, "option \"%s\" not recognized", opt) } } diff --git a/pkg/transformers/shuffle.go b/pkg/transformers/shuffle.go index 81098b35c..688230fb4 100644 --- a/pkg/transformers/shuffle.go +++ b/pkg/transformers/shuffle.go @@ -58,7 +58,6 @@ func transformerShuffleParseCLI( return nil, cli.ErrHelpRequested } else { - //lint:ignore SA4004 loop is intentionally structured this way return nil, cli.VerbErrorf(verbNameShuffle, "option \"%s\" not recognized", opt) } } diff --git a/pkg/transformers/skip_trivial_records.go b/pkg/transformers/skip_trivial_records.go index 329e0970b..e8ddd1fe5 100644 --- a/pkg/transformers/skip_trivial_records.go +++ b/pkg/transformers/skip_trivial_records.go @@ -55,7 +55,6 @@ func transformerSkipTrivialRecordsParseCLI( return nil, cli.ErrHelpRequested } else { - //lint:ignore SA4004 loop is intentionally structured this way return nil, cli.VerbErrorf(verbNameSkipTrivialRecords, "option \"%s\" not recognized", opt) } } diff --git a/pkg/transformers/tac.go b/pkg/transformers/tac.go index d9269404e..237d8a23a 100644 --- a/pkg/transformers/tac.go +++ b/pkg/transformers/tac.go @@ -54,7 +54,6 @@ func transformerTacParseCLI( return nil, cli.ErrHelpRequested } else { - //lint:ignore SA4004 loop is intentionally structured this way return nil, cli.VerbErrorf(verbNameTac, "option \"%s\" not recognized", opt) } } diff --git a/pkg/transformers/utf8_to_latin1.go b/pkg/transformers/utf8_to_latin1.go index a24463022..fbeebe383 100644 --- a/pkg/transformers/utf8_to_latin1.go +++ b/pkg/transformers/utf8_to_latin1.go @@ -57,7 +57,6 @@ func transformerUTF8ToLatin1ParseCLI( return nil, cli.ErrHelpRequested } else { - //lint:ignore SA4004 loop is intentionally structured this way return nil, cli.VerbErrorf(verbNameUTF8ToLatin1, "option \"%s\" not recognized", opt) } }