Prechádzať zdrojové kódy

Revert `go vet` incompatible changes (go1.0). More magic numbers.

Antoine Grondin 11 rokov pred
rodič
commit
07ce59b43f
3 zmenil súbory, kde vykonal 8 pridanie a 2 odobranie
  1. 3 0
      broker.go
  2. 3 0
      consumer.go
  3. 2 2
      real_decoder.go

+ 3 - 0
broker.go

@@ -232,6 +232,9 @@ func (b *Broker) sendAndReceive(clientID string, req requestEncoder, res decoder
 	case err = <-promise.errors:
 		return err
 	}
+
+	// For backward compatibility with go1.0
+	return nil
 }
 
 func (b *Broker) decode(pd packetDecoder) (err error) {

+ 3 - 0
consumer.go

@@ -168,6 +168,9 @@ func (c *Consumer) sendError(err error) bool {
 	case c.events <- &ConsumerEvent{Err: err}:
 		return true
 	}
+
+	// For backward compatibility with go1.0
+	return true
 }
 
 func (c *Consumer) fetchMessages() {

+ 2 - 2
real_decoder.go

@@ -143,7 +143,7 @@ func (rd *realDecoder) getInt32Array() ([]int32, error) {
 	ret := make([]int32, n)
 	for i := range ret {
 		ret[i] = int32(binary.BigEndian.Uint32(rd.raw[rd.off:]))
-		rd.off += 4
+		rd.off += binary.Size(ret[i])
 	}
 	return ret, nil
 }
@@ -168,7 +168,7 @@ func (rd *realDecoder) getInt64Array() ([]int64, error) {
 	ret := make([]int64, n)
 	for i := range ret {
 		ret[i] = int64(binary.BigEndian.Uint64(rd.raw[rd.off:]))
-		rd.off += 8
+		rd.off += binary.Size(ret[i])
 	}
 	return ret, nil
 }