Merge pull request coreos#258 from muesli/journal-shadow-fix

sdjournal: avoid unneeded variable shadowing

Author: lucab

sdjournal/read.go

@@ -135,14 +135,10 @@ func NewJournalReader(config JournalReaderConfig) (*JournalReader, error) {
 // don't fit in the read buffer. Callers should keep calling until 0 and/or an
 // error is returned.
 func (r *JournalReader) Read(b []byte) (int, error) {
-	var err error
-
 	if r.msgReader == nil {
-		var c uint64
-
 		// Advance the journal cursor. It has to be called at least one time
 		// before reading
-		c, err = r.journal.Next()
+		c, err := r.journal.Next()
 
 		// An unexpected error
 		if err != nil {
@@ -160,18 +156,15 @@ func (r *JournalReader) Read(b []byte) (int, error) {
 		}
 
 		// Build a message
-		var msg string
-		msg, err = r.formatter(entry)
-
+		msg, err := r.formatter(entry)
 		if err != nil {
 			return 0, err
 		}
 		r.msgReader = strings.NewReader(msg)
 	}
 
 	// Copy and return the message
-	var sz int
-	sz, err = r.msgReader.Read(b)
+	sz, err := r.msgReader.Read(b)
 	if err == io.EOF {
 		// The current entry has been fully read. Don't propagate this
 		// EOF, so the next entry can be read at the next Read()