Rename RdataLen to just Len

This commit is contained in:
Miek Gieben 2014-09-21 18:21:34 +01:00
parent f0e9df42dc
commit 685f708a9e
3 changed files with 8 additions and 8 deletions

View File

@ -103,7 +103,7 @@ func (rd *APAIR) Unpack(buf []byte) (int, error) {
}
func (rd *APAIR) CopyRdata(dest dns.PrivateRdata) error {
cp := make([]byte, rd.RdataLen())
cp := make([]byte, rd.Len())
_, err := rd.Pack(cp)
if err != nil {
return err
@ -115,7 +115,7 @@ func (rd *APAIR) CopyRdata(dest dns.PrivateRdata) error {
return nil
}
func (rd *APAIR) RdataLen() int {
func (rd *APAIR) Len() int {
return net.IPv4len * 2
}

View File

@ -27,8 +27,8 @@ type PrivateRdata interface {
Unpack([]byte) (int, error)
// CopyRdata copies the Rdata.
CopyRdata(PrivateRdata) error
// RdataLen returns the length in octets of the Rdata.
RdataLen() int
// Len returns the length in octets of the Rdata.
Len() int
}
// PrivateRR represents an RR that uses a PrivateRdata user-defined type.
@ -57,7 +57,7 @@ func (r *PrivateRR) Header() *RR_Header { return &r.Hdr }
func (r *PrivateRR) String() string { return r.Hdr.String() + r.Data.String() }
// Private len and copy parts to satisfy RR interface.
func (r *PrivateRR) len() int { return r.Hdr.len() + r.Data.RdataLen() }
func (r *PrivateRR) len() int { return r.Hdr.len() + r.Data.Len() }
func (r *PrivateRR) copy() RR {
// make new RR like this:
rr := mkPrivateRR(r.Hdr.Rrtype)

View File

@ -15,7 +15,7 @@ type ISBN struct {
func NewISBN() dns.PrivateRdata { return &ISBN{""} }
func (rd *ISBN) RdataLen() int { return len([]byte(rd.x)) }
func (rd *ISBN) Len() int { return len([]byte(rd.x)) }
func (rd *ISBN) String() string { return rd.x }
func (rd *ISBN) ParseTextSlice(txt []string) error {
@ -79,7 +79,7 @@ func TestPrivateByteSlice(t *testing.T) {
}
custrr := rr.(*dns.PrivateRR)
if ln := custrr.Data.RdataLen() + len(custrr.Header().Name) + 11; ln != off {
if ln := custrr.Data.Len() + len(custrr.Header().Name) + 11; ln != off {
t.Errorf("offset is not matching to length of Private RR: %d!=%d", off, ln)
}
@ -136,7 +136,7 @@ func (rd *VERSION) CopyRdata(dest dns.PrivateRdata) error {
return nil
}
func (rd *VERSION) RdataLen() int {
func (rd *VERSION) Len() int {
return len([]byte(rd.x))
}