refactor struct identifiers to follow conventional go names

[btrtrc.git] / util / types.go

diff --git a/util/types.go b/util/types.go
index d0655f148f9763b0e37d38b0bb0420e5cf012266..ad14f157c335e84908f6766e43aa617aac5d864f 100644 (file)
--- a/util/types.go
+++ b/util/types.go
@@ -22,19 +22,19 @@ var (
 )
 
 // This allows bencode.Unmarshal to do better than a string or []byte.
-func (me *CompactIPv4Peers) UnmarshalBencode(b []byte) (err error) {
+func (cps *CompactIPv4Peers) UnmarshalBencode(b []byte) (err error) {
        var bb []byte
        err = bencode.Unmarshal(b, &bb)
        if err != nil {
                return
        }
-       *me, err = UnmarshalIPv4CompactPeers(bb)
+       *cps, err = UnmarshalIPv4CompactPeers(bb)
        return
 }
 
-func (me CompactIPv4Peers) MarshalBinary() (ret []byte, err error) {
-       ret = make([]byte, len(me)*6)
-       for i, cp := range me {
+func (cps CompactIPv4Peers) MarshalBinary() (ret []byte, err error) {
+       ret = make([]byte, len(cps)*6)
+       for i, cp := range cps {
                copy(ret[6*i:], cp.IP.To4())
                binary.BigEndian.PutUint16(ret[6*i+4:], uint16(cp.Port))
        }
@@ -52,39 +52,39 @@ var (
        _ bencode.Unmarshaler = &CompactPeer{}
 )
 
-func (me CompactPeer) MarshalBencode() (ret []byte, err error) {
-       ip := me.IP
+func (cp CompactPeer) MarshalBencode() (ret []byte, err error) {
+       ip := cp.IP
        if ip4 := ip.To4(); ip4 != nil {
                ip = ip4
        }
        ret = make([]byte, len(ip)+2)
        copy(ret, ip)
-       binary.BigEndian.PutUint16(ret[len(ip):], uint16(me.Port))
+       binary.BigEndian.PutUint16(ret[len(ip):], uint16(cp.Port))
        return bencode.Marshal(ret)
 }
 
-func (me *CompactPeer) UnmarshalBinary(b []byte) error {
+func (cp *CompactPeer) UnmarshalBinary(b []byte) error {
        switch len(b) {
        case 18:
-               me.IP = make([]byte, 16)
+               cp.IP = make([]byte, 16)
        case 6:
-               me.IP = make([]byte, 4)
+               cp.IP = make([]byte, 4)
        default:
                return fmt.Errorf("bad compact peer string: %q", b)
        }
-       copy(me.IP, b)
-       b = b[len(me.IP):]
-       me.Port = int(binary.BigEndian.Uint16(b))
+       copy(cp.IP, b)
+       b = b[len(cp.IP):]
+       cp.Port = int(binary.BigEndian.Uint16(b))
        return nil
 }
 
-func (me *CompactPeer) UnmarshalBencode(b []byte) (err error) {
+func (cp *CompactPeer) UnmarshalBencode(b []byte) (err error) {
        var _b []byte
        err = bencode.Unmarshal(b, &_b)
        if err != nil {
                return
        }
-       return me.UnmarshalBinary(_b)
+       return cp.UnmarshalBinary(_b)
 }
 
 func UnmarshalIPv4CompactPeers(b []byte) (ret []CompactPeer, err error) {