From 12f4097df1f224ec664fa1d7376d5542941087fb Mon Sep 17 00:00:00 2001
From: Alexander Morozov <lk4d4@docker.com>
Date: Thu, 18 Jun 2015 17:41:46 -0700
Subject: [PATCH] Fix some style issues as suggested by golint
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
---
addr.go | 4 ++--
addr_linux.go | 2 +-
link_linux.go | 3 +--
neigh_linux.go | 2 +-
nl/nl_linux.go | 16 ++++++++--------
nl/xfrm_linux.go | 7 +++----
protinfo.go | 2 +-
route_linux.go | 4 ++--
xfrm_policy_linux.go | 2 +-
xfrm_state_linux.go | 2 +-
10 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/addr.go b/addr.go
index 5c12f4e..9bbaf50 100644
--- a/addr.go
+++ b/addr.go
@@ -14,8 +14,8 @@ type Addr struct {
}
// String returns $ip/$netmask $label
-func (addr Addr) String() string {
- return fmt.Sprintf("%s %s", addr.IPNet, addr.Label)
+func (a Addr) String() string {
+ return fmt.Sprintf("%s %s", a.IPNet, a.Label)
}
// ParseAddr parses the string representation of an address in the
diff --git a/addr_linux.go b/addr_linux.go
index d267f9a..19aac0f 100644
--- a/addr_linux.go
+++ b/addr_linux.go
@@ -81,7 +81,7 @@ func AddrList(link Link, family int) ([]Addr, error) {
index = base.Index
}
- res := make([]Addr, 0)
+ var res []Addr
for _, m := range msgs {
msg := nl.DeserializeIfAddrmsg(m)
diff --git a/link_linux.go b/link_linux.go
index 3c015a6..883cffc 100644
--- a/link_linux.go
+++ b/link_linux.go
@@ -579,8 +579,7 @@ func LinkList() ([]Link, error) {
return nil, err
}
- res := make([]Link, 0)
-
+ var res []Link
for _, m := range msgs {
link, err := linkDeserialize(m)
if err != nil {
diff --git a/neigh_linux.go b/neigh_linux.go
index 1fdaa3a..620a0ee 100644
--- a/neigh_linux.go
+++ b/neigh_linux.go
@@ -141,7 +141,7 @@ func NeighList(linkIndex, family int) ([]Neigh, error) {
return nil, err
}
- res := make([]Neigh, 0)
+ var res []Neigh
for _, m := range msgs {
ndm := deserializeNdmsg(m)
if linkIndex != 0 && int(ndm.Index) != linkIndex {
diff --git a/nl/nl_linux.go b/nl/nl_linux.go
index eb38d99..a554adb 100644
--- a/nl/nl_linux.go
+++ b/nl/nl_linux.go
@@ -172,16 +172,16 @@ type NetlinkRequest struct {
}
// Serialize the Netlink Request into a byte array
-func (msg *NetlinkRequest) Serialize() []byte {
+func (req *NetlinkRequest) Serialize() []byte {
length := syscall.SizeofNlMsghdr
- dataBytes := make([][]byte, len(msg.Data))
- for i, data := range msg.Data {
+ dataBytes := make([][]byte, len(req.Data))
+ for i, data := range req.Data {
dataBytes[i] = data.Serialize()
length = length + len(dataBytes[i])
}
- msg.Len = uint32(length)
+ req.Len = uint32(length)
b := make([]byte, length)
- hdr := (*(*[syscall.SizeofNlMsghdr]byte)(unsafe.Pointer(msg)))[:]
+ hdr := (*(*[syscall.SizeofNlMsghdr]byte)(unsafe.Pointer(req)))[:]
next := syscall.SizeofNlMsghdr
copy(b[0:next], hdr)
for _, data := range dataBytes {
@@ -193,9 +193,9 @@ func (msg *NetlinkRequest) Serialize() []byte {
return b
}
-func (msg *NetlinkRequest) AddData(data NetlinkRequestData) {
+func (req *NetlinkRequest) AddData(data NetlinkRequestData) {
if data != nil {
- msg.Data = append(msg.Data, data)
+ req.Data = append(req.Data, data)
}
}
@@ -218,7 +218,7 @@ func (req *NetlinkRequest) Execute(sockType int, resType uint16) ([][]byte, erro
return nil, err
}
- res := make([][]byte, 0)
+ var res [][]byte
done:
for {
diff --git a/nl/xfrm_linux.go b/nl/xfrm_linux.go
index d953130..d24637d 100644
--- a/nl/xfrm_linux.go
+++ b/nl/xfrm_linux.go
@@ -104,9 +104,8 @@ func (x *XfrmAddress) ToIPNet(prefixlen uint8) *net.IPNet {
ip := x.ToIP()
if GetIPFamily(ip) == FAMILY_V4 {
return &net.IPNet{IP: ip, Mask: net.CIDRMask(int(prefixlen), 32)}
- } else {
- return &net.IPNet{IP: ip, Mask: net.CIDRMask(int(prefixlen), 128)}
}
+ return &net.IPNet{IP: ip, Mask: net.CIDRMask(int(prefixlen), 128)}
}
func (x *XfrmAddress) FromIP(ip net.IP) {
@@ -125,8 +124,8 @@ func DeserializeXfrmAddress(b []byte) *XfrmAddress {
return (*XfrmAddress)(unsafe.Pointer(&b[0:SizeofXfrmAddress][0]))
}
-func (msg *XfrmAddress) Serialize() []byte {
- return (*(*[SizeofXfrmAddress]byte)(unsafe.Pointer(msg)))[:]
+func (x *XfrmAddress) Serialize() []byte {
+ return (*(*[SizeofXfrmAddress]byte)(unsafe.Pointer(x)))[:]
}
// struct xfrm_selector {
diff --git a/protinfo.go b/protinfo.go
index 79396da..f39ab8f 100644
--- a/protinfo.go
+++ b/protinfo.go
@@ -16,7 +16,7 @@ type Protinfo struct {
// String returns a list of enabled flags
func (prot *Protinfo) String() string {
- boolStrings := make([]string, 0)
+ var boolStrings []string
if prot.Hairpin {
boolStrings = append(boolStrings, "Hairpin")
}
diff --git a/route_linux.go b/route_linux.go
index 43872aa..88fa6db 100644
--- a/route_linux.go
+++ b/route_linux.go
@@ -119,7 +119,7 @@ func RouteList(link Link, family int) ([]Route, error) {
}
native := nl.NativeEndian()
- res := make([]Route, 0)
+ var res []Route
for _, m := range msgs {
msg := nl.DeserializeRtMsg(m)
@@ -193,7 +193,7 @@ func RouteGet(destination net.IP) ([]Route, error) {
}
native := nl.NativeEndian()
- res := make([]Route, 0)
+ var res []Route
for _, m := range msgs {
msg := nl.DeserializeRtMsg(m)
attrs, err := nl.ParseRouteAttr(m[msg.Len():])
diff --git a/xfrm_policy_linux.go b/xfrm_policy_linux.go
index 6fe1b63..2daf6dc 100644
--- a/xfrm_policy_linux.go
+++ b/xfrm_policy_linux.go
@@ -84,7 +84,7 @@ func XfrmPolicyList(family int) ([]XfrmPolicy, error) {
return nil, err
}
- res := make([]XfrmPolicy, 0)
+ var res []XfrmPolicy
for _, m := range msgs {
msg := nl.DeserializeXfrmUserpolicyInfo(m)
diff --git a/xfrm_state_linux.go b/xfrm_state_linux.go
index 0f1fbd0..5f44ec8 100644
--- a/xfrm_state_linux.go
+++ b/xfrm_state_linux.go
@@ -118,7 +118,7 @@ func XfrmStateList(family int) ([]XfrmState, error) {
return nil, err
}
- res := make([]XfrmState, 0)
+ var res []XfrmState
for _, m := range msgs {
msg := nl.DeserializeXfrmUsersaInfo(m)