Browse Source

Check some errors

Discovered by https://github.com/kisielk/errcheck
Evan Huus 11 years ago
parent
commit
39823e3af9
5 changed files with 35 additions and 25 deletions
  1. 7 4
      message.go
  2. 4 8
      message_set.go
  3. 7 8
      offset_fetch_request.go
  4. 9 3
      offset_response.go
  5. 8 2
      real_encoder.go

+ 7 - 4
message.go

@@ -56,8 +56,12 @@ func (m *Message) encode(pe packetEncoder) error {
 		case CompressionGZIP:
 			var buf bytes.Buffer
 			writer := gzip.NewWriter(&buf)
-			writer.Write(m.Value)
-			writer.Close()
+			if _, err = writer.Write(m.Value); err != nil {
+				return err
+			}
+			if err = writer.Close(); err != nil {
+				return err
+			}
 			m.compressedCache = buf.Bytes()
 			payload = m.compressedCache
 		case CompressionSnappy:
@@ -72,8 +76,7 @@ func (m *Message) encode(pe packetEncoder) error {
 		}
 	}
 
-	err = pe.putBytes(payload)
-	if err != nil {
+	if err = pe.putBytes(payload); err != nil {
 		return err
 	}
 

+ 4 - 8
message_set.go

@@ -25,24 +25,20 @@ func (msb *MessageBlock) encode(pe packetEncoder) error {
 }
 
 func (msb *MessageBlock) decode(pd packetDecoder) (err error) {
-	msb.Offset, err = pd.getInt64()
-	if err != nil {
+	if msb.Offset, err = pd.getInt64(); err != nil {
 		return err
 	}
 
-	pd.push(&lengthField{})
-	if err != nil {
+	if err = pd.push(&lengthField{}); err != nil {
 		return err
 	}
 
 	msb.Msg = new(Message)
-	err = msb.Msg.decode(pd)
-	if err != nil {
+	if err = msb.Msg.decode(pd); err != nil {
 		return err
 	}
 
-	err = pd.pop()
-	if err != nil {
+	if err = pd.pop(); err != nil {
 		return err
 	}
 

+ 7 - 8
offset_fetch_request.go

@@ -5,21 +5,20 @@ type OffsetFetchRequest struct {
 	partitions    map[string][]int32
 }
 
-func (r *OffsetFetchRequest) encode(pe packetEncoder) error {
-	err := pe.putString(r.ConsumerGroup)
-	if err != nil {
+func (r *OffsetFetchRequest) encode(pe packetEncoder) (err error) {
+	if err = pe.putString(r.ConsumerGroup); err != nil {
 		return err
 	}
-	err = pe.putArrayLength(len(r.partitions))
-	if err != nil {
+	if err = pe.putArrayLength(len(r.partitions)); err != nil {
 		return err
 	}
 	for topic, partitions := range r.partitions {
-		err = pe.putString(topic)
-		if err != nil {
+		if err = pe.putString(topic); err != nil {
+			return err
+		}
+		if err = pe.putInt32Array(partitions); err != nil {
 			return err
 		}
-		pe.putInt32Array(partitions)
 	}
 	return nil
 }

+ 9 - 3
offset_response.go

@@ -98,11 +98,17 @@ func (r *OffsetResponse) encode(pe packetEncoder) (err error) {
 	}
 
 	for topic, partitions := range r.Blocks {
-		pe.putString(topic)
-		pe.putArrayLength(len(partitions))
+		if err = pe.putString(topic); err != nil {
+			return err
+		}
+		if err = pe.putArrayLength(len(partitions)); err != nil {
+			return err
+		}
 		for partition, block := range partitions {
 			pe.putInt32(partition)
-			block.encode(pe)
+			if err = block.encode(pe); err != nil {
+				return err
+			}
 		}
 	}
 

+ 8 - 2
real_encoder.go

@@ -62,7 +62,10 @@ func (re *realEncoder) putString(in string) error {
 }
 
 func (re *realEncoder) putInt32Array(in []int32) error {
-	re.putArrayLength(len(in))
+	err := re.putArrayLength(len(in))
+	if err != nil {
+		return err
+	}
 	for _, val := range in {
 		re.putInt32(val)
 	}
@@ -70,7 +73,10 @@ func (re *realEncoder) putInt32Array(in []int32) error {
 }
 
 func (re *realEncoder) putInt64Array(in []int64) error {
-	re.putArrayLength(len(in))
+	err := re.putArrayLength(len(in))
+	if err != nil {
+		return err
+	}
 	for _, val := range in {
 		re.putInt64(val)
 	}