Removed un-needed arguments to constructors

Author: Jérôme Renard

rfc3164.go

@@ -5,11 +5,11 @@ import (
 	"time"
 )
 
-func NewRfc3164Parser(buff []byte, cursor int, l int) *rfc3164Parser {
+func NewRfc3164Parser(buff []byte) *rfc3164Parser {
 	return &rfc3164Parser{
 		buff:   buff,
-		cursor: cursor,
-		l:      l,
+		cursor: 0,
+		l:      len(buff),
 	}
 }
 

rfc3164_test.go

@@ -13,14 +13,12 @@ var _ = Suite(&Rfc3164TestSuite{})
 
 func (s *Rfc3164TestSuite) TestRfc3164Parser_Valid(c *C) {
 	buff := []byte("<34>Oct 11 22:14:15 mymachine su: 'su root' failed for lonvick on /dev/pts/8")
-	start := 0
-	l := len(buff)
 
-	p := NewRfc3164Parser(buff, start, l)
+	p := NewRfc3164Parser(buff)
 	expectedP := &rfc3164Parser{
 		buff:   buff,
-		cursor: start,
-		l:      l,
+		cursor: 0,
+		l:      len(buff),
 	}
 
 	c.Assert(p, DeepEquals, expectedP)
@@ -46,75 +44,68 @@ func (s *Rfc3164TestSuite) TestRfc3164Parser_Valid(c *C) {
 
 func (s *Rfc3164TestSuite) TestParseHeader_Valid(c *C) {
 	buff := []byte("Oct 11 22:14:15 mymachine ")
-	start := 0
 	now := time.Now()
 	hdr := rfc3164Header{
 		timestamp: time.Date(now.Year(), time.October, 11, 22, 14, 15, 0, time.UTC),
 		hostname:  "mymachine",
 	}
 
-	s.assertRfc3164Header(c, hdr, buff, start, 25, nil)
+	s.assertRfc3164Header(c, hdr, buff, 25, nil)
 }
 
 func (s *Rfc3164TestSuite) TestParseHeader_InvalidTimestamp(c *C) {
 	buff := []byte("Oct 34 32:72:82 mymachine ")
-	start := 0
 	hdr := rfc3164Header{}
 
-	s.assertRfc3164Header(c, hdr, buff, start, 16, ErrTimestampUnknownFormat)
+	s.assertRfc3164Header(c, hdr, buff, 16, ErrTimestampUnknownFormat)
 }
 
 func (s *Rfc3164TestSuite) TestParseMessage_Valid(c *C) {
 	content := "foo bar baz blah quux"
 	buff := []byte("sometag[123]: " + content)
-	start := 0
 	hdr := rfc3164Message{
 		tag:     "sometag",
 		content: content,
 	}
 
-	s.assertRfc3164Message(c, hdr, buff, start, len(buff), ErrEOL)
+	s.assertRfc3164Message(c, hdr, buff, len(buff), ErrEOL)
 }
 
 func (s *Rfc3164TestSuite) TestParseTimestamp_TooLong(c *C) {
 	// XXX : <15 chars
 	buff := []byte("aaa")
-	start := 0
 	ts := new(time.Time)
 
-	s.assertTimestamp(c, *ts, buff, start, len(buff), ErrEOL)
+	s.assertTimestamp(c, *ts, buff, len(buff), ErrEOL)
 }
 
 func (s *Rfc3164TestSuite) TestParseTimestamp_Invalid(c *C) {
 	buff := []byte("Oct 34 32:72:82")
-	start := 0
 	ts := new(time.Time)
 
-	s.assertTimestamp(c, *ts, buff, start, len(buff), ErrTimestampUnknownFormat)
+	s.assertTimestamp(c, *ts, buff, len(buff), ErrTimestampUnknownFormat)
 }
 
 func (s *Rfc3164TestSuite) TestParseTimestamp_TrailingSpace(c *C) {
 	// XXX : no year specified. Assumed current year
 	// XXX : no timezone specified. Assume UTC
 	buff := []byte("Oct 11 22:14:15 ")
-	start := 0
 
 	now := time.Now()
 	ts := time.Date(now.Year(), time.October, 11, 22, 14, 15, 0, time.UTC)
 
-	s.assertTimestamp(c, ts, buff, start, len(buff), nil)
+	s.assertTimestamp(c, ts, buff, len(buff), nil)
 }
 
 func (s *Rfc3164TestSuite) TestParseTimestamp_Valid(c *C) {
 	// XXX : no year specified. Assumed current year
 	// XXX : no timezone specified. Assume UTC
 	buff := []byte("Oct 11 22:14:15")
-	start := 0
 
 	now := time.Now()
 	ts := time.Date(now.Year(), time.October, 11, 22, 14, 15, 0, time.UTC)
 
-	s.assertTimestamp(c, ts, buff, start, len(buff), nil)
+	s.assertTimestamp(c, ts, buff, len(buff), nil)
 }
 
 func (s *Rfc3164TestSuite) TestParseTag_TooLong(c *C) {
@@ -123,42 +114,37 @@ func (s *Rfc3164TestSuite) TestParseTag_TooLong(c *C) {
 
 	aaa := "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 	buff := []byte(aaa + "[10]:")
-	start := 0
 	tag := ""
 
-	s.assertTag(c, tag, buff, start, len(aaa)+1, ErrTagTooLong)
+	s.assertTag(c, tag, buff, len(aaa)+1, ErrTagTooLong)
 }
 
 func (s *Rfc3164TestSuite) TestParseTag_Pid(c *C) {
 	buff := []byte("apache2[10]:")
-	start := 0
 	tag := "apache2"
 
-	s.assertTag(c, tag, buff, start, len(buff), nil)
+	s.assertTag(c, tag, buff, len(buff), nil)
 }
 
 func (s *Rfc3164TestSuite) TestParseTag_NoPid(c *C) {
 	buff := []byte("apache2:")
-	start := 0
 	tag := "apache2"
 
-	s.assertTag(c, tag, buff, start, len(buff), nil)
+	s.assertTag(c, tag, buff, len(buff), nil)
 }
 
 func (s *Rfc3164TestSuite) TestParseTag_TrailingSpace(c *C) {
 	buff := []byte("apache2: ")
-	start := 0
 	tag := "apache2"
 
-	s.assertTag(c, tag, buff, start, len(buff), nil)
+	s.assertTag(c, tag, buff, len(buff), nil)
 }
 
 func (s *Rfc3164TestSuite) TestParseContent_Valid(c *C) {
 	buff := []byte(" foo bar baz quux ")
-	start := 0
 	content := string(bytes.Trim(buff, " "))
 
-	p := NewRfc3164Parser(buff, start, len(buff))
+	p := NewRfc3164Parser(buff)
 	obtained, err := p.parseContent()
 	c.Assert(err, Equals, ErrEOL)
 	c.Assert(obtained, Equals, content)
@@ -167,9 +153,8 @@ func (s *Rfc3164TestSuite) TestParseContent_Valid(c *C) {
 
 func (s *Rfc3164TestSuite) BenchmarkParseTimestamp(c *C) {
 	buff := []byte("Oct 11 22:14:15")
-	l := len(buff)
 
-	p := NewRfc3164Parser(buff, 0, l)
+	p := NewRfc3164Parser(buff)
 
 	for i := 0; i < c.N; i++ {
 		_, err := p.parseTimestamp()
@@ -183,10 +168,8 @@ func (s *Rfc3164TestSuite) BenchmarkParseTimestamp(c *C) {
 
 func (s *Rfc3164TestSuite) BenchmarkParseHostname(c *C) {
 	buff := []byte("gimli.local")
-	var start int
-	l := len(buff)
 
-	p := NewRfc3164Parser(buff, start, l)
+	p := NewRfc3164Parser(buff)
 
 	for i := 0; i < c.N; i++ {
 		_, err := p.parseHostname()
@@ -200,9 +183,8 @@ func (s *Rfc3164TestSuite) BenchmarkParseHostname(c *C) {
 
 func (s *Rfc3164TestSuite) BenchmarkParseTag(c *C) {
 	buff := []byte("apache2[10]:")
-	l := len(buff)
 
-	p := NewRfc3164Parser(buff, 0, l)
+	p := NewRfc3164Parser(buff)
 
 	for i := 0; i < c.N; i++ {
 		_, err := p.parseTag()
@@ -216,9 +198,8 @@ func (s *Rfc3164TestSuite) BenchmarkParseTag(c *C) {
 
 func (s *Rfc3164TestSuite) BenchmarkParseHeader(c *C) {
 	buff := []byte("Oct 11 22:14:15 mymachine ")
-	l := len(buff)
 
-	p := NewRfc3164Parser(buff, 0, l)
+	p := NewRfc3164Parser(buff)
 
 	for i := 0; i < c.N; i++ {
 		_, err := p.parseHeader()
@@ -232,10 +213,8 @@ func (s *Rfc3164TestSuite) BenchmarkParseHeader(c *C) {
 
 func (s *Rfc3164TestSuite) BenchmarkParseMessage(c *C) {
 	buff := []byte("sometag[123]: foo bar baz blah quux")
-	var start int
-	l := len(buff)
 
-	p := NewRfc3164Parser(buff, start, l)
+	p := NewRfc3164Parser(buff)
 
 	for i := 0; i < c.N; i++ {
 		_, err := p.parseMessage()
@@ -247,32 +226,32 @@ func (s *Rfc3164TestSuite) BenchmarkParseMessage(c *C) {
 	}
 }
 
-func (s *Rfc3164TestSuite) assertTimestamp(c *C, ts time.Time, b []byte, cursor int, expC int, e error) {
-	p := NewRfc3164Parser(b, cursor, len(b))
+func (s *Rfc3164TestSuite) assertTimestamp(c *C, ts time.Time, b []byte, expC int, e error) {
+	p := NewRfc3164Parser(b)
 	obtained, err := p.parseTimestamp()
 	c.Assert(obtained, Equals, ts)
 	c.Assert(p.cursor, Equals, expC)
 	c.Assert(err, Equals, e)
 }
 
-func (s *Rfc3164TestSuite) assertTag(c *C, t string, b []byte, cursor int, expC int, e error) {
-	p := NewRfc3164Parser(b, cursor, len(b))
+func (s *Rfc3164TestSuite) assertTag(c *C, t string, b []byte, expC int, e error) {
+	p := NewRfc3164Parser(b)
 	obtained, err := p.parseTag()
 	c.Assert(obtained, Equals, t)
 	c.Assert(p.cursor, Equals, expC)
 	c.Assert(err, Equals, e)
 }
 
-func (s *Rfc3164TestSuite) assertRfc3164Header(c *C, hdr rfc3164Header, b []byte, cursor int, expC int, e error) {
-	p := NewRfc3164Parser(b, cursor, len(b))
+func (s *Rfc3164TestSuite) assertRfc3164Header(c *C, hdr rfc3164Header, b []byte, expC int, e error) {
+	p := NewRfc3164Parser(b)
 	obtained, err := p.parseHeader()
 	c.Assert(err, Equals, e)
 	c.Assert(obtained, Equals, hdr)
 	c.Assert(p.cursor, Equals, expC)
 }
 
-func (s *Rfc3164TestSuite) assertRfc3164Message(c *C, msg rfc3164Message, b []byte, cursor int, expC int, e error) {
-	p := NewRfc3164Parser(b, cursor, len(b))
+func (s *Rfc3164TestSuite) assertRfc3164Message(c *C, msg rfc3164Message, b []byte, expC int, e error) {
+	p := NewRfc3164Parser(b)
 	obtained, err := p.parseMessage()
 	c.Assert(err, Equals, e)
 	c.Assert(obtained, Equals, msg)

rfc5424.go

@@ -14,11 +14,11 @@ const (
 	NILVALUE = '-'
 )
 
-func NewRfc5424Parser(buff []byte, cursor int, l int) *rfc5424Parser {
+func NewRfc5424Parser(buff []byte) *rfc5424Parser {
 	return &rfc5424Parser{
 		buff:   buff,
-		cursor: cursor,
-		l:      l,
+		cursor: 0,
+		l:      len(buff),
 	}
 }