community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Somewhat nicer

This commit is contained in:
Miek Gieben 2012-01-12 11:17:01 +01:00
parent 92a51b4374
commit a3949750be
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
parse_test.go
View File

@ -107,18 +107,18 @@ z3.miek.nl. IN NSEC miek.nl. TXT RRSIG NSEC`
if x.Error == nil {
switch i {
case 0:
if x.Rr.Header().Name != "z1.miek.nl." {
if x.RR.Header().Name != "z1.miek.nl." {
t.Log("Failed to parse z1")
t.Fail()
}
case 1:
if x.Rr.Header().Name != "z2.miek.nl." {
if x.RR.Header().Name != "z2.miek.nl." {
t.Log("Failed to parse z2")
t.Fail()
}
case 2:
if x.Rr.String() != "z3.miek.nl.\t100\tIN\tNSEC\tmiek.nl. TXT RRSIG NSEC" {
t.Logf("Failed to parse z3 %s", x.Rr.String())
if x.RR.String() != "z3.miek.nl.\t100\tIN\tNSEC\tmiek.nl. TXT RRSIG NSEC" {
t.Logf("Failed to parse z3 %s", x.RR.String())
t.Fail()
}
}
@ -247,7 +247,7 @@ func TestZoneParsing(t *testing.T) {
to := ParseZone(f)
var i int
for x := range to {
t.Logf("%s\n", x.Rr)
t.Logf("%s\n", x.RR)
i++
}
delta := time.Now().UnixNano() - start
@ -265,10 +265,10 @@ func TestZoneParsingBigZonePrint(t *testing.T) {
to := ParseZone(f)
var i int
for x := range to {
if x.Rr != nil {
println(x.Rr.String())
if x.RR != nil {
println(x.RR.String())
}
// t.Logf("%s\n", x.Rr)
// t.Logf("%s\n", x.RR)
i++
}
delta := time.Now().UnixNano() - start

6
zscan.go
View File

@ -74,7 +74,7 @@ type lex struct {
}
type Token struct {
Rr RR // the scanned resource record
RR // the scanned resource record
Error *ParseError // when an error occured, this is the specifics
}
@ -94,7 +94,7 @@ func NewRR(s string) (RR, error) {
if r.Error != nil {
return nil, r.Error
}
return r.Rr, nil
return r.RR, nil
}
// ParseZone reads a RFC 1035 zone from r. It returns each parsed RR or on error
@ -291,7 +291,7 @@ func parseZone(r io.Reader, t chan Token) {
t <- Token{Error: e}
return
}
t <- Token{Rr: r}
t <- Token{RR: r}
st = _EXPECT_OWNER_DIR
}
}