From 16bf113a5141de7177d17987124069d4c6f50666 Mon Sep 17 00:00:00 2001 From: Ghislain Bourgeois Date: Tue, 16 Jan 2024 09:03:48 -0500 Subject: [PATCH] Fix linting --- .github/workflows/main.yml | 2 +- .golangci.yml | 3 -- aper.go | 59 ++++++++++++++++++++------------------ aper_test.go | 10 +++---- marshal.go | 9 ++++-- 5 files changed, 43 insertions(+), 40 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b2415b..4601352 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: uses: golangci/golangci-lint-action@v3.7.0 with: version: latest - args: -v --config ./.golangci.yml + args: run license-check: runs-on: ubuntu-latest diff --git a/.golangci.yml b/.golangci.yml index 2b4f232..1edd71b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -212,9 +212,6 @@ linters-settings: misspell: #locale: US ignore-words: - whitespace: - multi-if: false # Enforces newlines (or comments) after every multi-line if statement - multi-func: false # Enforces newlines (or comments) after every multi-line function signature wsl: # If true append is only allowed to be cuddled if appending value is # matching variables, fields or types on line above. Default is true. diff --git a/aper.go b/aper.go index 2113017..06ae5ec 100644 --- a/aper.go +++ b/aper.go @@ -150,7 +150,7 @@ func (pd *perBitData) parseConstraintValue(valueRange int64) (value uint64, err if valueRange <= 255 { if valueRange < 0 { err = fmt.Errorf("Value range is negative") - return + return value, err } var i uint // 1 ~ 8 bits @@ -161,17 +161,17 @@ func (pd *perBitData) parseConstraintValue(valueRange int64) (value uint64, err } } value, err = pd.getBitsValue(i) - return + return value, err } else if valueRange == 256 { bytes = 1 } else if valueRange <= 65536 { bytes = 2 } else { err = fmt.Errorf("Constraint Value is large than 65536") - return + return value, err } if err = pd.parseAlignBits(); err != nil { - return + return value, err } value, err = pd.getBitsValue(bytes * 8) return value, err @@ -181,17 +181,17 @@ func (pd *perBitData) parseSemiConstrainedWholeNumber(lb uint64) (value uint64, var repeat bool var length uint64 if length, err = pd.parseLength(-1, &repeat); err != nil { - return + return value, err } if length > 8 || repeat { err = fmt.Errorf("Too long length: %d", length) - return + return value, err } if value, err = pd.getBitsValue(uint(length) * 8); err != nil { - return + return value, err } value += lb - return + return value, err } func (pd *perBitData) parseNormallySmallNonNegativeWholeNumber() (value uint64, err error) { @@ -218,27 +218,27 @@ func (pd *perBitData) parseLength(sizeRange int64, repeat *bool) (value uint64, } if err = pd.parseAlignBits(); err != nil { - return + return value, err } firstByte, err := pd.getBitsValue(8) if err != nil { - return + return value, err } if (firstByte & 128) == 0 { // #10.9.3.6 value = firstByte & 0x7F - return + return value, err } else if (firstByte & 64) == 0 { // #10.9.3.7 var secondByte uint64 if secondByte, err = pd.getBitsValue(8); err != nil { - return + return value, err } value = ((firstByte & 63) << 8) | secondByte - return + return value, err } firstByte &= 63 if firstByte < 1 || firstByte > 4 { err = fmt.Errorf("Parse Length Out of Constraint") - return + return value, err } *repeat = true value = 16384 * firstByte @@ -335,7 +335,8 @@ func (pd *perBitData) parseBitString(extensed bool, lowerBoundPtr *int64, upperB } func (pd *perBitData) parseOctetString(extensed bool, lowerBoundPtr *int64, upperBoundPtr *int64) ( - OctetString, error) { + OctetString, error, +) { var lb, ub, sizeRange int64 = 0, -1, -1 if !extensed { if lowerBoundPtr != nil { @@ -513,7 +514,8 @@ func (pd *perBitData) parseInteger(extensed bool, lowerBoundPtr *int64, upperBou } func (pd *perBitData) parseEnumerated(extensed bool, lowerBoundPtr *int64, upperBoundPtr *int64) (value uint64, - err error) { + err error, +) { if lowerBoundPtr == nil || upperBoundPtr == nil { err = fmt.Errorf("ENUMERATED value constraint is error") return @@ -542,7 +544,8 @@ func (pd *perBitData) parseEnumerated(extensed bool, lowerBoundPtr *int64, upper } func (pd *perBitData) parseSequenceOf(sizeExtensed bool, params fieldParameters, sliceType reflect.Type) ( - reflect.Value, error) { + reflect.Value, error, +) { var sliceContent reflect.Value var lb int64 = 0 var sizeRange int64 @@ -908,17 +911,17 @@ func parseField(v reflect.Value, pd *perBitData, params fieldParameters) error { // // The following tags on struct fields have special meaning to Unmarshal: // -// optional OPTIONAL tag in SEQUENCE -// sizeExt specifies that size is extensible -// valueExt specifies that value is extensible -// sizeLB set the minimum value of size constraint -// sizeUB set the maximum value of value constraint -// valueLB set the minimum value of size constraint -// valueUB set the maximum value of value constraint -// default sets the default value -// openType specifies the open Type -// referenceFieldName the string of the reference field for this type (only if openType used) -// referenceFieldValue the corresponding value of the reference field for this type (only if openType used) +// optional OPTIONAL tag in SEQUENCE +// sizeExt specifies that size is extensible +// valueExt specifies that value is extensible +// sizeLB set the minimum value of size constraint +// sizeUB set the maximum value of value constraint +// valueLB set the minimum value of size constraint +// valueUB set the maximum value of value constraint +// default sets the default value +// openType specifies the open Type +// referenceFieldName the string of the reference field for this type (only if openType used) +// referenceFieldValue the corresponding value of the reference field for this type (only if openType used) // // Other ASN.1 types are not supported; if it encounters them, // Unmarshal returns a parse error. diff --git a/aper_test.go b/aper_test.go index ff61a9a..5a069af 100644 --- a/aper_test.go +++ b/aper_test.go @@ -450,7 +450,7 @@ var intTest2Data = []intTest2{ {3}, } -// 2 <= bmax-bmin <= 255 +// 2 <= bmax-bmin <= 255 type intTest3 struct { Value int64 `aper:"valueLB:1,valueUB:110"` } @@ -462,7 +462,7 @@ var intTest3Data = []intTest3{ {110}, } -// bmax-bmin == 256 +// bmax-bmin == 256 type intTest4 struct { Value int64 `aper:"valueLB:0,valueUB:255"` } @@ -471,7 +471,7 @@ var intTest4Data = []intTest4{ {140}, } -// 257 <= bmax-bmin <= 65536 +// 257 <= bmax-bmin <= 65536 type intTest5 struct { Value int64 `aper:"valueLB:0,valueUB:65535"` } @@ -480,7 +480,7 @@ var intTest5Data = []intTest5{ {140}, } -// 65537 <= bmax-bmin +// 65537 <= bmax-bmin type intTest6 struct { Value int64 `aper:"valueLB:0,valueUB:4294967295"` } @@ -492,7 +492,7 @@ var intTest6Data = []intTest6{ {65536}, } -// value extensed +// value extensed type intTest7 struct { Value int64 `aper:"valueExt,valueLB:0,valueUB:45"` } diff --git a/marshal.go b/marshal.go index 13080ed..2139aac 100644 --- a/marshal.go +++ b/marshal.go @@ -186,7 +186,8 @@ func (pd *perRawBitData) appendLength(sizeRange int64, value uint64) (err error) } func (pd *perRawBitData) appendBitString(bytes []byte, bitsLength uint64, extensive bool, - lowerBoundPtr *int64, upperBoundPtr *int64) error { + lowerBoundPtr *int64, upperBoundPtr *int64, +) error { var err error var lb, ub, sizeRange int64 = 0, -1, -1 if lowerBoundPtr != nil { @@ -277,7 +278,8 @@ func (pd *perRawBitData) appendBitString(bytes []byte, bitsLength uint64, extens } func (pd *perRawBitData) appendOctetString(bytes []byte, extensive bool, lowerBoundPtr *int64, - upperBoundPtr *int64) error { + upperBoundPtr *int64, +) error { byteLen := uint64(len(bytes)) var lb, ub, sizeRange int64 = 0, -1, -1 if lowerBoundPtr != nil { @@ -482,7 +484,8 @@ func (pd *perRawBitData) appendInteger(value int64, extensive bool, lowerBoundPt } func (pd *perRawBitData) appendEnumerated(value uint64, extensive bool, lowerBoundPtr *int64, - upperBoundPtr *int64) error { + upperBoundPtr *int64, +) error { if lowerBoundPtr == nil || upperBoundPtr == nil { return fmt.Errorf("ENUMERATED value constraint is error") }