Skip to content

Commit 4802c0e

Browse files
skip2skip2
committed
golint fixes
1 parent 4942dea commit 4802c0e

10 files changed

+97
-94
lines changed

‎encoder.go

+18-17
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ type dataEncoder struct {
116116

117117
// newDataEncoder constructs a dataEncoder.
118118
func newDataEncoder(t dataEncoderType) *dataEncoder {
119-
var d *dataEncoder = &dataEncoder{}
119+
d := &dataEncoder{}
120120

121121
switch t {
122122
case dataEncoderType1To9:
@@ -168,7 +168,7 @@ func (d *dataEncoder) encode(data []byte) (*bitset.Bitset, error) {
168168
d.optimised = nil
169169

170170
if len(data) == 0 {
171-
return nil, errors.New("No data to encode")
171+
return nil, errors.New("no data to encode")
172172
}
173173

174174
// Classify data into unoptimised segments.
@@ -181,7 +181,7 @@ func (d *dataEncoder) encode(data []byte) (*bitset.Bitset, error) {
181181
}
182182

183183
// Encode data.
184-
var encoded *bitset.Bitset = bitset.New()
184+
encoded := bitset.New()
185185
for _, s := range d.optimised {
186186
d.encodeDataRaw(s.data, s.dataMode, encoded)
187187
}
@@ -193,8 +193,8 @@ func (d *dataEncoder) encode(data []byte) (*bitset.Bitset, error) {
193193
// e.g. "123ZZ#!#!" =>
194194
// [numeric, 3, "123"] [alphanumeric, 2, "ZZ"] [byte, 4, "#!#!"].
195195
func (d *dataEncoder) classifyDataModes() {
196-
var start int = 0
197-
var mode dataMode = dataModeNone
196+
var start int
197+
mode := dataModeNone
198198

199199
for i, v := range d.data {
200200
newMode := dataModeNone
@@ -271,7 +271,7 @@ func (d *dataEncoder) optimiseDataModes() error {
271271
}
272272
}
273273

274-
var optimised segment = segment{dataMode: mode,
274+
optimised := segment{dataMode: mode,
275275
data: make([]byte, 0, numChars)}
276276

277277
for k := i; k < j; k++ {
@@ -289,8 +289,8 @@ func (d *dataEncoder) optimiseDataModes() error {
289289
// encodeDataRaw encodes data in dataMode. The encoded data is appended to
290290
// encoded.
291291
func (d *dataEncoder) encodeDataRaw(data []byte, dataMode dataMode, encoded *bitset.Bitset) {
292-
var modeIndicator *bitset.Bitset = d.modeIndicator(dataMode)
293-
var charCountBits int = d.charCountBits(dataMode)
292+
modeIndicator := d.modeIndicator(dataMode)
293+
charCountBits := d.charCountBits(dataMode)
294294

295295
// Append mode indicator.
296296
encoded.Append(modeIndicator)
@@ -304,8 +304,9 @@ func (d *dataEncoder) encodeDataRaw(data []byte, dataMode dataMode, encoded *bit
304304
for i := 0; i < len(data); i += 3 {
305305
charsRemaining := len(data) - i
306306

307-
var value uint32 = 0
308-
var bitsUsed int = 1
307+
var value uint32
308+
bitsUsed := 1
309+
309310
for j := 0; j < charsRemaining && j < 3; j++ {
310311
value *= 10
311312
value += uint32(data[i+j] - 0x30)
@@ -317,13 +318,13 @@ func (d *dataEncoder) encodeDataRaw(data []byte, dataMode dataMode, encoded *bit
317318
for i := 0; i < len(data); i += 2 {
318319
charsRemaining := len(data) - i
319320

320-
var value uint32 = 0
321+
var value uint32
321322
for j := 0; j < charsRemaining && j < 2; j++ {
322323
value *= 45
323324
value += encodeAlphanumericCharacter(data[i+j])
324325
}
325326

326-
var bitsUsed int = 6
327+
bitsUsed := 6
327328
if charsRemaining > 1 {
328329
bitsUsed = 11
329330
}
@@ -382,20 +383,20 @@ func (d *dataEncoder) charCountBits(dataMode dataMode) int {
382383
// An error is returned if the mode is not supported, or the length requested is
383384
// too long to be represented.
384385
func (d *dataEncoder) encodedLength(dataMode dataMode, n int) (int, error) {
385-
var modeIndicator *bitset.Bitset = d.modeIndicator(dataMode)
386-
var charCountBits int = d.charCountBits(dataMode)
386+
modeIndicator := d.modeIndicator(dataMode)
387+
charCountBits := d.charCountBits(dataMode)
387388

388389
if modeIndicator == nil {
389-
return 0, errors.New("Mode not supported")
390+
return 0, errors.New("mode not supported")
390391
}
391392

392393
maxLength := (1 << uint8(charCountBits)) - 1
393394

394395
if n > maxLength {
395-
return 0, errors.New("Length too long to be represented")
396+
return 0, errors.New("length too long to be represented")
396397
}
397398

398-
var length int = modeIndicator.Len() + charCountBits
399+
length := modeIndicator.Len() + charCountBits
399400

400401
switch dataMode {
401402
case dataModeNumeric:

‎encoder_test.go

+11-9
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func TestByteModeLengthCalculations(t *testing.T) {
7070
}{}
7171

7272
for i, test := range tests {
73-
var encoder *dataEncoder = newDataEncoder(test.dataEncoderType)
73+
encoder := newDataEncoder(test.dataEncoderType)
7474
var resultLength int
7575

7676
resultLength, err := encoder.encodedLength(test.dataMode, test.numSymbols)
@@ -126,9 +126,9 @@ func TestSingleModeEncodings(t *testing.T) {
126126
}
127127

128128
for _, test := range tests {
129-
var encoder *dataEncoder = newDataEncoder(test.dataEncoderType)
129+
encoder := newDataEncoder(test.dataEncoderType)
130+
encoded := bitset.New()
130131

131-
var encoded *bitset.Bitset = bitset.New()
132132
encoder.encodeDataRaw([]byte(test.data), test.dataMode, encoded)
133133

134134
if !test.expected.Equals(encoded) {
@@ -244,9 +244,9 @@ func TestOptimiseEncoding(t *testing.T) {
244244
numTotalChars += v.numChars
245245
}
246246

247-
var data []byte = make([]byte, numTotalChars)
247+
data := make([]byte, numTotalChars)
248248

249-
var i int = 0
249+
i := 0
250250
for _, v := range test.actual {
251251
for j := 0; j < v.numChars; j++ {
252252
switch v.dataMode {
@@ -264,14 +264,14 @@ func TestOptimiseEncoding(t *testing.T) {
264264
}
265265
}
266266

267-
var encoder *dataEncoder = newDataEncoder(test.dataEncoderType)
267+
encoder := newDataEncoder(test.dataEncoderType)
268268

269269
_, err := encoder.encode(data)
270270

271271
if err != nil {
272272
t.Errorf("Got %s, expected valid encoding", err.Error())
273273
} else {
274-
var ok bool = true
274+
ok := true
275275

276276
if len(encoder.optimised) != len(test.optimised) {
277277
ok = false
@@ -294,7 +294,8 @@ func TestOptimiseEncoding(t *testing.T) {
294294
}
295295

296296
func testModeSegmentsString(segments []testModeSegment) string {
297-
var result string = "["
297+
result := "["
298+
298299
for i, segment := range segments {
299300
if i > 0 {
300301
result += ", "
@@ -310,7 +311,8 @@ func testModeSegmentsString(segments []testModeSegment) string {
310311
}
311312

312313
func segmentsString(segments []segment) string {
313-
var result string = "["
314+
result := "["
315+
314316
for i, segment := range segments {
315317
if i > 0 {
316318
result += ", "

‎qrcode.go

+24-24
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ func New(content string, level RecoveryLevel) (*QRCode, error) {
137137
if err != nil {
138138
return nil, err
139139
} else if chosenVersion == nil {
140-
return nil, errors.New("Content too long to encode")
140+
return nil, errors.New("content too long to encode")
141141
}
142142

143-
var q *QRCode = &QRCode{
143+
q := &QRCode{
144144
Content: content,
145145

146146
Level: level,
@@ -180,13 +180,13 @@ func newWithForcedVersion(content string, version int, level RecoveryLevel) (*QR
180180
return nil, err
181181
}
182182

183-
var chosenVersion *qrCodeVersion = getQRCodeVersion(level, version)
183+
chosenVersion := getQRCodeVersion(level, version)
184184

185185
if chosenVersion == nil {
186-
return nil, errors.New("Cannot find QR Code version")
186+
return nil, errors.New("cannot find QR Code version")
187187
}
188188

189-
var q *QRCode = &QRCode{
189+
q := &QRCode{
190190
Content: content,
191191

192192
Level: level,
@@ -234,17 +234,16 @@ func (q *QRCode) Image(size int) image.Image {
234234
// Center the symbol within the image.
235235
offset := (size - realSize*pixelsPerModule) / 2
236236

237-
var rect image.Rectangle = image.Rectangle{Min: image.Point{0, 0}, Max: image.Point{size, size}}
238-
239-
var img *image.RGBA = image.NewRGBA(rect)
237+
rect := image.Rectangle{Min: image.Point{0, 0}, Max: image.Point{size, size}}
238+
img := image.NewRGBA(rect)
240239

241240
for i := 0; i < size; i++ {
242241
for j := 0; j < size; j++ {
243242
img.Set(i, j, q.BackgroundColor)
244243
}
245244
}
246245

247-
var bitmap [][]bool = q.symbol.bitmap()
246+
bitmap := q.symbol.bitmap()
248247
for y, row := range bitmap {
249248
for x, v := range row {
250249
if v {
@@ -267,7 +266,7 @@ func (q *QRCode) Image(size int) image.Image {
267266
// size is both the image width and height in pixels. If size is too small then
268267
// a larger image is silently returned.
269268
func (q *QRCode) PNG(size int) ([]byte, error) {
270-
var img image.Image = q.Image(size)
269+
img := q.Image(size)
271270

272271
var b bytes.Buffer
273272
err := png.Encode(&b, img)
@@ -302,10 +301,10 @@ func (q *QRCode) encode(numTerminatorBits int) {
302301
q.addTerminatorBits(numTerminatorBits)
303302
q.addPadding()
304303

305-
var encoded *bitset.Bitset = q.encodeBlocks()
304+
encoded := q.encodeBlocks()
306305

307-
var numMasks int = 8
308-
var penalty int = 0
306+
const numMasks int = 8
307+
penalty := 0
309308

310309
for mask := 0; mask < numMasks; mask++ {
311310
var s *symbol
@@ -317,7 +316,7 @@ func (q *QRCode) encode(numTerminatorBits int) {
317316
log.Panic(err.Error())
318317
}
319318

320-
var p int = s.penaltyScore()
319+
p := s.penaltyScore()
321320

322321
//log.Printf("mask=%d p=%3d p1=%3d p2=%3d p3=%3d p4=%d\n", mask, p, s.penalty1(), s.penalty2(), s.penalty3(), s.penalty4())
323322

@@ -351,18 +350,19 @@ func (q *QRCode) encodeBlocks() *bitset.Bitset {
351350
ecStartOffset int
352351
}
353352

354-
var block []dataBlock = make([]dataBlock, q.version.numBlocks())
353+
block := make([]dataBlock, q.version.numBlocks())
354+
355+
start := 0
356+
end := 0
357+
blockID := 0
355358

356-
var start int = 0
357-
var end int = 0
358-
var blockID int = 0
359359
for _, b := range q.version.block {
360360
for j := 0; j < b.numBlocks; j++ {
361361
start = end
362362
end = start + b.numDataCodewords*8
363363

364364
// Apply error correction to each block.
365-
var numErrorCodewords int = b.numCodewords - b.numDataCodewords
365+
numErrorCodewords := b.numCodewords - b.numDataCodewords
366366
block[blockID].data = reedsolomon.Encode(q.data.Substr(start, end), numErrorCodewords)
367367
block[blockID].ecStartOffset = end - start
368368

@@ -380,7 +380,7 @@ func (q *QRCode) encodeBlocks() *bitset.Bitset {
380380
result := bitset.New()
381381

382382
// Combine data blocks.
383-
var working bool = true
383+
working := true
384384
for i := 0; working; i += 8 {
385385
working = false
386386

@@ -401,7 +401,7 @@ func (q *QRCode) encodeBlocks() *bitset.Bitset {
401401
working = false
402402

403403
for j, b := range block {
404-
var offset int = i + block[j].ecStartOffset
404+
offset := i + block[j].ecStartOffset
405405
if offset >= block[j].data.Len() {
406406
continue
407407
}
@@ -422,9 +422,9 @@ func (q *QRCode) encodeBlocks() *bitset.Bitset {
422422
func max(a int, b int) int {
423423
if a > b {
424424
return a
425-
} else {
426-
return b
427425
}
426+
427+
return b
428428
}
429429

430430
// addPadding pads the encoded data upto the full length required.
@@ -439,7 +439,7 @@ func (q *QRCode) addPadding() {
439439
q.data.AppendNumBools(q.version.numBitsToPadToCodeword(q.data.Len()), false)
440440

441441
// Pad codewords 0b11101100 and 0b00010001.
442-
var padding [2]*bitset.Bitset = [2]*bitset.Bitset{
442+
padding := [2]*bitset.Bitset{
443443
bitset.New(true, true, true, false, true, true, false, false),
444444
bitset.New(false, false, false, true, false, false, false, true),
445445
}

‎qrcode_decode_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,13 @@ func TestDecodeFuzz(t *testing.T) {
142142
t.Skip("Decode fuzz tests not enabled")
143143
}
144144

145-
var r *rand.Rand = rand.New(rand.NewSource(0))
145+
r := rand.New(rand.NewSource(0))
146146

147-
const kIterations int = 32
148-
const kMaxLength int = 128
147+
const iterations int = 32
148+
const maxLength int = 128
149149

150-
for i := 0; i < kIterations; i++ {
151-
len := r.Intn(kMaxLength-1) + 1
150+
for i := 0; i < iterations; i++ {
151+
len := r.Intn(maxLength-1) + 1
152152

153153
var content string
154154
for j := 0; j < len; j++ {
@@ -179,7 +179,7 @@ func zbarimgCheck(q *QRCode) error {
179179

180180
if s != q.Content {
181181
q.WriteFile(256, fmt.Sprintf("%x.png", q.Content))
182-
return fmt.Errorf("Got '%s' (%x) expected '%s' (%x)", s, s, q.Content, q.Content)
182+
return fmt.Errorf("got '%s' (%x) expected '%s' (%x)", s, s, q.Content, q.Content)
183183
}
184184

185185
return nil
@@ -194,7 +194,7 @@ func zbarimgDecode(q *QRCode) (string, error) {
194194
return "", err
195195
}
196196

197-
var cmd *exec.Cmd = exec.Command("zbarimg", "--quiet", "-Sdisable",
197+
cmd := exec.Command("zbarimg", "--quiet", "-Sdisable",
198198
"-Sqrcode.enable", "/dev/stdin")
199199

200200
var out bytes.Buffer

0 commit comments

Comments
 (0)