Skip to content

Commit 3d91f2c

Browse files
committed
Golint for pcapgo.
1 parent 780c931 commit 3d91f2c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.travis.golint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
cd "$(dirname $0)"
44

55
go get github.com/golang/lint/golint
6-
DIRS=". tcpassembly ip4defrag macs"
6+
DIRS=". tcpassembly ip4defrag macs pcapgo"
77
# Add subdirectories here as we clean up golint on each.
88
for subdir in $DIRS; do
99
pushd $subdir

pcapgo/read.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,21 @@ func (r *Reader) readHeader() error {
101101
r.byteOrder = binary.BigEndian
102102
r.nanoSecsFactor = 1000
103103
} else {
104-
return errors.New(fmt.Sprintf("Unknown magic %x", magic))
104+
return fmt.Errorf("Unknown magic %x", magic)
105105
}
106106
if r.versionMajor = r.byteOrder.Uint16(buf[4:6]); r.versionMajor != versionMajor {
107-
return errors.New(fmt.Sprintf("Unknown major version %d", r.versionMajor))
107+
return fmt.Errorf("Unknown major version %d", r.versionMajor)
108108
}
109109
if r.versionMinor = r.byteOrder.Uint16(buf[6:8]); r.versionMinor != versionMinor {
110-
return errors.New(fmt.Sprintf("Unknown minor version %d", r.versionMinor))
110+
return fmt.Errorf("Unknown minor version %d", r.versionMinor)
111111
}
112112
// ignore timezone 8:12 and sigfigs 12:16
113113
r.snaplen = r.byteOrder.Uint32(buf[16:20])
114114
r.linkType = layers.LinkType(r.byteOrder.Uint32(buf[20:24]))
115115
return nil
116116
}
117117

118-
// Read next packet from file
118+
// ReadPacketData reads next packet from file.
119119
func (r *Reader) ReadPacketData() (data []byte, ci gopacket.CaptureInfo, err error) {
120120
if ci, err = r.readPacketHeader(); err != nil {
121121
return

0 commit comments

Comments
 (0)