Skip to content

Commit

Permalink
dev: Cleanup linters and fix some unused args
Browse files Browse the repository at this point in the history
  • Loading branch information
wader committed Jul 19, 2022
1 parent 6011d0b commit 342612e
Show file tree
Hide file tree
Showing 76 changed files with 122 additions and 123 deletions.
83 changes: 41 additions & 42 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,43 @@
linters:
enable:
- revive
- errname
- goimports
- nilerr
- forcetypeassert
- asciicheck
- bodyclose
- durationcheck
- errorlint
- noctx
- misspell
- exportloopref
- unconvert
- unparam
- wastedassign
- makezero
- exhaustive
- gosec
- nolintlint
- nakedret
- predeclared
- tagliatelle

run:
skip-dirs:
- dev
- doc

enable:
- asciicheck
- bodyclose
- durationcheck
- errname
- errorlint
- exhaustive
- exportloopref
- forcetypeassert
- goimports
- gosec
- makezero
- misspell
- nakedret
- nilerr
- noctx
- nolintlint
- nosprintfhostport
- predeclared
- revive
- tagliatelle
- unconvert
- unparam
- wastedassign
linters-settings:
misspell:
ignore-words:
# elf RELA
- rela
- equalisation
- synchronisation
exhaustive:
default-signifies-exhaustive: true
gosec:
excludes:
# allow md5
- G401
- G501
exhaustive:
default-signifies-exhaustive: true
gosec:
excludes:
- G401
- G501
misspell:
ignore-words:
# elf RELA
- rela
- equalisation
- synchronisation
run:
skip-dirs:
# allow md5
- dev
- doc
2 changes: 1 addition & 1 deletion doc/presentations/bts2022/mp3.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
func decode(d *decode.D, in any) any {
func decode(d *decode.D, _ any) any {
d.FieldArray("headers", func(d *decode.D) {
for !d.End() {
d.TryFieldFormat("header", headerGroup)
Expand Down
2 changes: 1 addition & 1 deletion format/ape/apev2.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func init() {
})
}

func apev2Decode(d *decode.D, in any) any {
func apev2Decode(d *decode.D, _ any) any {
d.Endian = decode.LittleEndian

headerFooterFn := func(d *decode.D, name string) uint64 {
Expand Down
2 changes: 1 addition & 1 deletion format/ar/ar.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func init() {
})
}

func decodeAr(d *decode.D, in any) any {
func decodeAr(d *decode.D, _ any) any {
d.FieldUTF8("signature", 8, d.AssertStr("!<arch>\n"))
d.FieldArray("files", func(d *decode.D) {
for !d.End() {
Expand Down
2 changes: 1 addition & 1 deletion format/asn1/asn1_ber.go
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ func decodeASN1BERValue(d *decode.D, bib *bitio.Buffer, sb *strings.Builder, par
})
}

func decodeASN1BER(d *decode.D, in any) any {
func decodeASN1BER(d *decode.D, _ any) any {
decodeASN1BERValue(d, nil, nil, formConstructed, universalTypeSequence)
return nil
}
2 changes: 1 addition & 1 deletion format/av1/av1_ccr.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func init() {
})
}

func ccrDecode(d *decode.D, in any) any {
func ccrDecode(d *decode.D, _ any) any {
d.FieldU1("marker")
d.FieldU7("version")
d.FieldU3("seq_profile")
Expand Down
2 changes: 1 addition & 1 deletion format/av1/av1_frame.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func init() {
})
}

func frameDecode(d *decode.D, in any) any {
func frameDecode(d *decode.D, _ any) any {
for d.NotEnd() {
d.FieldFormat("obu", obuFormat, nil)
}
Expand Down
2 changes: 1 addition & 1 deletion format/av1/av1_obu.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func decodeLeb128(d *decode.D) uint64 {
return v
}

func obuDecode(d *decode.D, in any) any {
func obuDecode(d *decode.D, _ any) any {
var obuType uint64
var obuSize int64
hasExtension := false
Expand Down
2 changes: 1 addition & 1 deletion format/avro/avro_ocf.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func decodeBlockCodec(d *decode.D, dataSize int64, codec string) *bytes.Buffer {
return bb
}

func decodeAvroOCF(d *decode.D, in any) any {
func decodeAvroOCF(d *decode.D, _ any) any {
header := decodeHeader(d)

decodeFn, err := decoders.DecodeFnForSchema(header.Schema)
Expand Down
2 changes: 1 addition & 1 deletion format/bencode/bencode.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func decodeBencodeValue(d *decode.D) {
}
}

func decodeBencode(d *decode.D, in any) any {
func decodeBencode(d *decode.D, _ any) any {
decodeBencodeValue(d)
return nil
}
2 changes: 1 addition & 1 deletion format/bson/bson.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func decodeBSONDocument(d *decode.D) {
})
}

func decodeBSON(d *decode.D, in any) any {
func decodeBSON(d *decode.D, _ any) any {
d.Endian = decode.LittleEndian

decodeBSONDocument(d)
Expand Down
2 changes: 1 addition & 1 deletion format/bzip2/bzip2.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func (bfr bitFlipReader) Read(p []byte) (n int, err error) {
return n, err
}

func bzip2Decode(d *decode.D, in any) any {
func bzip2Decode(d *decode.D, _ any) any {
// moreStreams := true

// d.FieldArray("streams", func(d *decode.D) {
Expand Down
2 changes: 1 addition & 1 deletion format/cbor/cbor.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ func decodeCBORValue(d *decode.D) any {
panic("unreachable")
}

func decodeCBOR(d *decode.D, in any) any {
func decodeCBOR(d *decode.D, _ any) any {
decodeCBORValue(d)
return nil
}
2 changes: 1 addition & 1 deletion format/elf/elf.go
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ func elfDecodeSectionHeaders(d *decode.D, ec elfContext) {
}
}

func elfDecode(d *decode.D, in any) any {
func elfDecode(d *decode.D, _ any) any {
var ec elfContext

d.FieldStruct("header", func(d *decode.D) { elfDecodeHeader(d, &ec) })
Expand Down
2 changes: 1 addition & 1 deletion format/fairplay/fairplay.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func init() {
})
}

func fairPlaySPCDecode(d *decode.D, in any) any {
func fairPlaySPCDecode(d *decode.D, _ any) any {
d.FieldU32("version")
d.FieldRawLen("reserved", 32)
d.FieldRawLen("iv", 16*8)
Expand Down
2 changes: 1 addition & 1 deletion format/flac/flac.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func init() {
})
}

func flacDecode(d *decode.D, in any) any {
func flacDecode(d *decode.D, _ any) any {
d.FieldUTF8("magic", 4, d.AssertStr("fLaC"))

var streamInfo format.FlacStreamInfo
Expand Down
2 changes: 1 addition & 1 deletion format/flac/flac_metadatablock.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var metadataBlockNames = scalar.UToSymStr{
MetadataBlockPicture: "picture",
}

func metadatablockDecode(d *decode.D, in any) any {
func metadatablockDecode(d *decode.D, _ any) any {
var hasStreamInfo bool
var streamInfo format.FlacStreamInfo

Expand Down
2 changes: 1 addition & 1 deletion format/flac/flac_metadatablocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func init() {
})
}

func metadatablocksDecode(d *decode.D, in any) any {
func metadatablocksDecode(d *decode.D, _ any) any {
flacMetadatablocksOut := format.FlacMetadatablocksOut{}

isLastBlock := false
Expand Down
2 changes: 1 addition & 1 deletion format/flac/flac_picture.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func init() {
})
}

func pictureDecode(d *decode.D, in any) any {
func pictureDecode(d *decode.D, _ any) any {
lenStr := func(name string) string {
l := d.FieldU32(name + "_length")
return d.FieldUTF8(name, int(l))
Expand Down
2 changes: 1 addition & 1 deletion format/flac/flac_streaminfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func init() {
})
}

func streaminfoDecode(d *decode.D, in any) any {
func streaminfoDecode(d *decode.D, _ any) any {
d.FieldU16("minimum_block_size")
d.FieldU16("maximum_block_size")
d.FieldU24("minimum_frame_size")
Expand Down
2 changes: 1 addition & 1 deletion format/flv/flv.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ var typeNames = scalar.UToSymStr{
typeLongString: "LongString",
}

func flvDecode(d *decode.D, in any) any {
func flvDecode(d *decode.D, _ any) any {
var fieldScriptDataObject func()
var fieldScriptDataVariable func(d *decode.D, name string)

Expand Down
2 changes: 1 addition & 1 deletion format/gif/gif.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func fieldColorMap(d *decode.D, name string, bitDepth int) {
})
}

func gifDecode(d *decode.D, in any) any {
func gifDecode(d *decode.D, _ any) any {
d.Endian = decode.LittleEndian

d.FieldUTF8("header", 6, d.AssertStr("GIF87a", "GIF89a"))
Expand Down
2 changes: 1 addition & 1 deletion format/gzip/gzip.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var deflateExtraFlagsNames = scalar.UToSymStr{
4: "fast",
}

func gzDecode(d *decode.D, in any) any {
func gzDecode(d *decode.D, _ any) any {
d.Endian = decode.LittleEndian

d.FieldRawLen("identification", 2*8, d.AssertBitBuf([]byte("\x1f\x8b")))
Expand Down
2 changes: 1 addition & 1 deletion format/icc/icc_profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func decodeBCDU8(d *decode.D) uint64 {
return (n>>4)*10 + n&0xf
}

func iccProfileDecode(d *decode.D, in any) any {
func iccProfileDecode(d *decode.D, _ any) any {
/*
0..3 Profile size uInt32Number
4..7 CMM Type signature see below
Expand Down
2 changes: 1 addition & 1 deletion format/id3/id3v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func init() {
}

// Decode ID3v1 tag
func id3v1Decode(d *decode.D, in any) any {
func id3v1Decode(d *decode.D, _ any) any {
d.AssertAtLeastBitsLeft(128 * 8)
d.FieldUTF8("magic", 3, d.AssertStr("TAG"))
if d.PeekBits(8) == uint64('+') {
Expand Down
2 changes: 1 addition & 1 deletion format/id3/id3v11.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func init() {
})
}

func id3v11Decode(d *decode.D, in any) any {
func id3v11Decode(d *decode.D, _ any) any {
d.AssertAtLeastBitsLeft(128 * 8)
d.FieldUTF8("magic", 4, d.AssertStr("TAG+"))
d.FieldUTF8("title", 60)
Expand Down
4 changes: 2 additions & 2 deletions format/id3/id3v2.go
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ func decodeFrame(d *decode.D, version int) uint64 {
// TODO: DecodeFn
// TODO: unknown after frame decode
unsyncedBR := d.NewBitBufFromReader(unsyncReader{Reader: bitio.NewIOReader(d.BitBufRange(d.Pos(), int64(dataSize)*8))})
d.FieldFormatBitBuf("unsync", unsyncedBR, decode.FormatFn(func(d *decode.D, in any) any {
d.FieldFormatBitBuf("unsync", unsyncedBR, decode.FormatFn(func(d *decode.D, _ any) any {
if fn, ok := frames[idNormalized]; ok {
fn(d)
} else {
Expand Down Expand Up @@ -586,7 +586,7 @@ func decodeFrames(d *decode.D, version int, size uint64) {
}
}

func id3v2Decode(d *decode.D, in any) any {
func id3v2Decode(d *decode.D, _ any) any {
d.AssertAtLeastBitsLeft(4 * 8)
d.FieldUTF8("magic", 3, d.AssertStr("ID3"))
version := int(d.FieldU8("version"))
Expand Down
2 changes: 1 addition & 1 deletion format/jpeg/jpeg.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ var markers = scalar.UToScalar{
TEM: {Sym: "tem", Description: "For temporary private use in arithmetic coding"},
}

func jpegDecode(d *decode.D, in any) any {
func jpegDecode(d *decode.D, _ any) any {
d.AssertLeastBytesLeft(2)
if !bytes.Equal(d.PeekBytes(2), []byte{0xff, SOI}) {
d.Errorf("no SOI marker")
Expand Down
2 changes: 1 addition & 1 deletion format/json/json.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func init() {
})
}

func decodeJSON(d *decode.D, in any) any {
func decodeJSON(d *decode.D, _ any) any {
br := d.RawLen(d.Len())
jd := stdjson.NewDecoder(bitio.NewIOReader(br))
var s scalar.S
Expand Down
2 changes: 1 addition & 1 deletion format/macho/macho.go
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ var sectionTypes = scalar.UToSymStr{
0x15: "thread_local_init_function_pointers",
}

func machoDecode(d *decode.D, in any) any {
func machoDecode(d *decode.D, _ any) any {
ofileDecode(d)
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/matroska.go
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ func decodeMaster(d *decode.D, bitsLimit int64, tag ebml.Tag, dc *decodeContext)

}

func matroskaDecode(d *decode.D, in any) any {
func matroskaDecode(d *decode.D, _ any) any {
ebmlHeaderID := uint64(0x1a45dfa3)
if d.PeekBits(32) != ebmlHeaderID {
d.Errorf("no EBML header found")
Expand Down
2 changes: 1 addition & 1 deletion format/mp3/xing.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func init() {
})
}

func xingDecode(d *decode.D, in any) any {
func xingDecode(d *decode.D, _ any) any {
// TODO: info has lame extension?
hasLameExtension := false
switch d.FieldUTF8("header", 4) {
Expand Down
2 changes: 1 addition & 1 deletion format/mp4/pssh_playready.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var recordTypeNames = scalar.UToSymStr{
recordTypeLicenseStore: "License store",
}

func playreadyPsshDecode(d *decode.D, in any) any {
func playreadyPsshDecode(d *decode.D, _ any) any {
d.Endian = decode.LittleEndian

d.FieldU32("size")
Expand Down
2 changes: 1 addition & 1 deletion format/mpeg/adts.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func init() {
})
}

func adtsDecoder(d *decode.D, in any) any {
func adtsDecoder(d *decode.D, _ any) any {
validFrames := 0
for !d.End() {
if dv, _, _ := d.TryFieldFormat("frame", adtsFrame, nil); dv == nil {
Expand Down
2 changes: 1 addition & 1 deletion format/mpeg/adts_frame.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var protectionAbsentNames = scalar.BoolToDescription{
false: "Has CRC",
}

func adtsFrameDecoder(d *decode.D, in any) any {
func adtsFrameDecoder(d *decode.D, _ any) any {

/*
adts_frame() {
Expand Down

0 comments on commit 342612e

Please sign in to comment.