Skip to content

Commit fc71982

Browse files
author
Reinier Schoof
committed
enabled ineffassign in golangci
1 parent 1b39835 commit fc71982

File tree

8 files changed

+8
-13
lines changed

8 files changed

+8
-13
lines changed

.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ linters:
1616
- unconvert
1717
- whitespace
1818
- govet
19+
- ineffassign
1920
# ToDo:
2021
#- gosimple
21-
#- ineffassign
2222
#- gocritic
2323
#- golint
2424
linters-settings:

client/resp.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ func (c *Conn) handleOKPacket(data []byte) (*Result, error) {
5353

5454
//todo:strict_mode, check warnings as error
5555
r.Warnings = binary.LittleEndian.Uint16(data[pos:])
56-
pos += 2
56+
// pos += 2
5757
} else if c.capability&CLIENT_TRANSACTIONS > 0 {
5858
r.Status = binary.LittleEndian.Uint16(data[pos:])
5959
c.status = r.Status
60-
pos += 2
60+
// pos += 2
6161
}
6262

6363
//new ok package will check CLIENT_SESSION_TRACK too, but I don't support it now.

client/stmt.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ func (c *Conn) Prepare(query string) (*Stmt, error) {
214214

215215
//warnings
216216
s.warnings = int(binary.LittleEndian.Uint16(data[pos:]))
217-
pos += 2
217+
// pos += 2
218218

219219
if s.params > 0 {
220220
if err := s.conn.readUntilEOF(); err != nil {

mysql/mysql_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ func (t *mysqlTestSuite) TestMysqlGTIDInterval(c *check.C) {
3737
i, err = parseInterval("1-1")
3838
c.Assert(err, check.IsNil)
3939
c.Assert(i, check.DeepEquals, Interval{1, 2})
40-
41-
i, err = parseInterval("1-2")
42-
c.Assert(err, check.IsNil)
4340
}
4441

4542
func (t *mysqlTestSuite) TestMysqlGTIDIntervalSlice(c *check.C) {

mysql/rowdata.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (p RowData) ParseText(f []*Field, dst []FieldValue) ([]FieldValue, error) {
2727
var v []byte
2828
var isNull bool
2929
var pos int = 0
30-
var n int = 0
30+
var n int
3131

3232
for i := range f {
3333
v, isNull, n, err = LengthEncodedString(p[pos:])

replication/event.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (h *EventHeader) Decode(data []byte) error {
9191
pos += 4
9292

9393
h.Flags = binary.LittleEndian.Uint16(data[pos:])
94-
pos += 2
94+
// pos += 2
9595

9696
if h.EventSize < uint32(EventHeaderSize) {
9797
return errors.Errorf("invalid event size %d, must >= 19", h.EventSize)
@@ -420,7 +420,7 @@ func (e *GTIDEvent) Decode(data []byte) error {
420420
// If the most significant bit set, another 4 byte follows representing OriginalServerVersion
421421
e.ImmediateServerVersion &= ^(uint32(1) << 31)
422422
e.OriginalServerVersion = binary.LittleEndian.Uint32(data[pos:])
423-
pos += 4
423+
// pos += 4
424424
} else {
425425
// Otherwise OriginalServerVersion == ImmediateServerVersion
426426
e.OriginalServerVersion = e.ImmediateServerVersion

replication/replication_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,12 @@ func (t *testSyncerSuite) testSync(c *C, s *BinlogStreamer) {
7272
return
7373
}
7474

75-
eventCount := 0
7675
for {
7776
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
7877
e, err := s.GetEvent(ctx)
7978
cancel()
8079

8180
if err == context.DeadlineExceeded {
82-
eventCount += 1
8381
return
8482
}
8583

server/stmt.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func (c *Conn) bindStmtArgs(s *Stmt, nullBitmap, paramTypes, paramValues []byte)
170170
pos := 0
171171

172172
var v []byte
173-
var n int = 0
173+
var n int
174174
var isNull bool
175175
var err error
176176

0 commit comments

Comments
 (0)