From 2a67631d76627b762968cd12388cd6ee67f33996 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Fri, 17 Nov 2017 10:48:42 +0000 Subject: [PATCH] cleanup: remove debug.Printf from scanner (#573) Remove the debug.Printf stuff from scanner and some other style nits. --- parse_test.go | 2 +- scan.go | 35 ++++++----------------------------- server_test.go | 4 ++-- 3 files changed, 9 insertions(+), 32 deletions(-) diff --git a/parse_test.go b/parse_test.go index a61943cd..10f89f77 100644 --- a/parse_test.go +++ b/parse_test.go @@ -1425,6 +1425,6 @@ func TestUnbalancedParens(t *testing.T) { x8A4M3e23mRZ9VrbpMngwcrqNAg== )` _, err := NewRR(sig) if err == nil { - t.Fatalf("Failed to detect extra opening brace") + t.Fatalf("failed to detect extra opening brace") } } diff --git a/scan.go b/scan.go index ba74b6a5..9b045ba7 100644 --- a/scan.go +++ b/scan.go @@ -2,22 +2,11 @@ package dns import ( "io" - "log" "os" "strconv" "strings" ) -type debugging bool - -const debug debugging = false - -func (d debugging) Printf(format string, args ...interface{}) { - if d { - log.Printf(format, args...) - } -} - const maxTok = 2048 // Largest token we can return. const maxUint16 = 1<<16 - 1 @@ -127,7 +116,7 @@ func NewRR(s string) (RR, error) { // See NewRR for more documentation. func ReadRR(q io.Reader, filename string) (RR, error) { defttl := &ttlState{defaultTtl, false} - r := <-parseZoneHelper(q, ".", defttl, filename, 1) + r := <-parseZoneHelper(q, ".", filename, defttl, 1) if r == nil { return nil, nil } @@ -164,16 +153,16 @@ func ReadRR(q io.Reader, filename string) (RR, error) { // The text "; this is comment" is returned in Token.Comment. Comments inside the // RR are discarded. Comments on a line by themselves are discarded too. func ParseZone(r io.Reader, origin, file string) chan *Token { - return parseZoneHelper(r, origin, nil, file, 10000) + return parseZoneHelper(r, origin, file, nil, 10000) } -func parseZoneHelper(r io.Reader, origin string, defttl *ttlState, file string, chansize int) chan *Token { +func parseZoneHelper(r io.Reader, origin, file string, defttl *ttlState, chansize int) chan *Token { t := make(chan *Token, chansize) - go parseZone(r, origin, defttl, file, t, 0) + go parseZone(r, origin, file, defttl, t, 0) return t } -func parseZone(r io.Reader, origin string, defttl *ttlState, f string, t chan *Token, include int) { +func parseZone(r io.Reader, origin, f string, defttl *ttlState, t chan *Token, include int) { defer func() { if include == 0 { close(t) @@ -317,7 +306,7 @@ func parseZone(r io.Reader, origin string, defttl *ttlState, f string, t chan *T t <- &Token{Error: &ParseError{f, "too deeply nested $INCLUDE", l}} return } - parseZone(r1, neworigin, defttl, l.token, t, include+1) + parseZone(r1, neworigin, l.token, defttl, t, include+1) st = zExpectOwnerDir case zExpectDirTTLBl: if l.value != zBlank { @@ -509,14 +498,12 @@ func zlexer(s *scan, c chan lex) { if stri >= maxTok { l.token = "token length insufficient for parsing" l.err = true - debug.Printf("[%+v]", l.token) c <- l return } if comi >= maxTok { l.token = "comment length insufficient for parsing" l.err = true - debug.Printf("[%+v]", l.token) c <- l return } @@ -559,7 +546,6 @@ func zlexer(s *scan, c chan lex) { case "$GENERATE": l.value = zDirGenerate } - debug.Printf("[7 %+v]", l.token) c <- l } else { l.value = zString @@ -601,7 +587,6 @@ func zlexer(s *scan, c chan lex) { } } } - debug.Printf("[6 %+v]", l.token) c <- l } stri = 0 @@ -610,7 +595,6 @@ func zlexer(s *scan, c chan lex) { l.value = zBlank l.token = " " l.length = 1 - debug.Printf("[5 %+v]", l.token) c <- l } owner = false @@ -633,7 +617,6 @@ func zlexer(s *scan, c chan lex) { l.token = string(str[:stri]) l.tokenUpper = strings.ToUpper(l.token) l.length = stri - debug.Printf("[4 %+v]", l.token) c <- l stri = 0 } @@ -671,7 +654,6 @@ func zlexer(s *scan, c chan lex) { l.tokenUpper = l.token l.length = 1 l.comment = string(com[:comi]) - debug.Printf("[3 %+v %+v]", l.token, l.comment) c <- l l.comment = "" comi = 0 @@ -697,14 +679,12 @@ func zlexer(s *scan, c chan lex) { rrtype = true } } - debug.Printf("[2 %+v]", l.token) c <- l } l.value = zNewline l.token = "\n" l.tokenUpper = l.token l.length = 1 - debug.Printf("[1 %+v]", l.token) c <- l stri = 0 commt = false @@ -750,7 +730,6 @@ func zlexer(s *scan, c chan lex) { l.tokenUpper = strings.ToUpper(l.token) l.length = stri - debug.Printf("[%+v]", l.token) c <- l stri = 0 } @@ -786,7 +765,6 @@ func zlexer(s *scan, c chan lex) { l.token = "extra closing brace" l.tokenUpper = l.token l.err = true - debug.Printf("[%+v]", l.token) c <- l return } @@ -812,7 +790,6 @@ func zlexer(s *scan, c chan lex) { l.tokenUpper = strings.ToUpper(l.token) l.length = stri l.value = zString - debug.Printf("[%+v]", l.token) c <- l } if brace != 0 { diff --git a/server_test.go b/server_test.go index 1a4b7ca0..7693e761 100644 --- a/server_test.go +++ b/server_test.go @@ -654,11 +654,11 @@ func TestServerStartStopRace(t *testing.T) { s := &Server{} s, _, _, err = RunLocalUDPServerWithFinChan(":0") if err != nil { - t.Fatalf("Could not start server: %s", err) + t.Fatalf("could not start server: %s", err) } go func() { if err := s.Shutdown(); err != nil { - t.Fatalf("Could not stop server: %s", err) + t.Fatalf("could not stop server: %s", err) } }() }