Browse Source

go.net/ipv4: simplify, drop unnecessary parentheses and slice indices

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/7300102
Mikio Hara 13 years ago
parent
commit
b38392a462
3 changed files with 6 additions and 6 deletions
  1. 2 2
      ipv4/control_linux.go
  2. 3 3
      ipv4/header.go
  3. 1 1
      ipv4/packet.go

+ 2 - 2
ipv4/control_linux.go

@@ -95,7 +95,7 @@ func marshalControlMessage(cm *ControlMessage) (oob []byte) {
 	pi := &syscall.Inet4Pktinfo{}
 	pi := &syscall.Inet4Pktinfo{}
 	pion := false
 	pion := false
 	if ip := cm.Src.To4(); ip != nil {
 	if ip := cm.Src.To4(); ip != nil {
-		copy(pi.Spec_dst[:], ip[0:net.IPv4len])
+		copy(pi.Spec_dst[:], ip[:net.IPv4len])
 		pion = true
 		pion = true
 	}
 	}
 	if cm.IfIndex != 0 {
 	if cm.IfIndex != 0 {
@@ -109,7 +109,7 @@ func marshalControlMessage(cm *ControlMessage) (oob []byte) {
 		cmsg.Type = syscall.IP_PKTINFO
 		cmsg.Type = syscall.IP_PKTINFO
 		cmsg.SetLen(syscall.CmsgLen(syscall.SizeofInet4Pktinfo))
 		cmsg.SetLen(syscall.CmsgLen(syscall.SizeofInet4Pktinfo))
 		data := b[syscall.CmsgLen(0):]
 		data := b[syscall.CmsgLen(0):]
-		copy(data[0:syscall.SizeofInet4Pktinfo], (*[syscall.SizeofInet4Pktinfo]byte)(unsafe.Pointer(pi))[:syscall.SizeofInet4Pktinfo])
+		copy(data[:syscall.SizeofInet4Pktinfo], (*[syscall.SizeofInet4Pktinfo]byte)(unsafe.Pointer(pi))[:syscall.SizeofInet4Pktinfo])
 		oob = append(oob, b...)
 		oob = append(oob, b...)
 	}
 	}
 	return
 	return

+ 3 - 3
ipv4/header.go

@@ -146,10 +146,10 @@ func (h *Header) Marshal() ([]byte, error) {
 	b[posProtocol] = byte(h.Protocol)
 	b[posProtocol] = byte(h.Protocol)
 	b[posChecksum], b[posChecksum+1] = byte(h.Checksum>>8), byte(h.Checksum)
 	b[posChecksum], b[posChecksum+1] = byte(h.Checksum>>8), byte(h.Checksum)
 	if ip := h.Src.To4(); ip != nil {
 	if ip := h.Src.To4(); ip != nil {
-		copy(b[posSrc:posSrc+net.IPv4len], ip[0:net.IPv4len])
+		copy(b[posSrc:posSrc+net.IPv4len], ip[:net.IPv4len])
 	}
 	}
 	if ip := h.Dst.To4(); ip != nil {
 	if ip := h.Dst.To4(); ip != nil {
-		copy(b[posDst:posDst+net.IPv4len], ip[0:net.IPv4len])
+		copy(b[posDst:posDst+net.IPv4len], ip[:net.IPv4len])
 	} else {
 	} else {
 		return nil, errMissingAddress
 		return nil, errMissingAddress
 	}
 	}
@@ -164,7 +164,7 @@ func ParseHeader(b []byte) (*Header, error) {
 	if len(b) < HeaderLen {
 	if len(b) < HeaderLen {
 		return nil, errHeaderTooShort
 		return nil, errHeaderTooShort
 	}
 	}
-	hdrlen := (int(b[0]) & 0x0f) << 2
+	hdrlen := int(b[0]&0x0f) << 2
 	if hdrlen > len(b) {
 	if hdrlen > len(b) {
 		return nil, errBufferTooShort
 		return nil, errBufferTooShort
 	}
 	}

+ 1 - 1
ipv4/packet.go

@@ -49,7 +49,7 @@ func slicePacket(b []byte) (h, p []byte, err error) {
 	if len(b) < HeaderLen {
 	if len(b) < HeaderLen {
 		return nil, nil, errHeaderTooShort
 		return nil, nil, errHeaderTooShort
 	}
 	}
-	hdrlen := (int(b[0]) & 0x0f) << 2
+	hdrlen := int(b[0]&0x0f) << 2
 	return b[:hdrlen], b[hdrlen:], nil
 	return b[:hdrlen], b[hdrlen:], nil
 }
 }