improve readability

Author: evanoberholster

cr3.go

@@ -13,7 +13,7 @@ import (
 
 // readerPool for buffer
 var readerPool = sync.Pool{
-	New: func() interface{} { return bufio.NewReader(nil) },
+	New: func() interface{} { return bufio.NewReaderSize(nil, 4*1024) },
 }
 
 // DecodeCR3 decodes a CR3 file from an io.Reader returning Exif or an error.

exif2/buffer.go

@@ -11,19 +11,19 @@ import (
 )
 
 const (
-	tagMaxLength = 64
+	tagMaxCount  = 64
 	bufferLength = 512
 )
 
 // buffer for data and tags
 type buffer struct {
 	buf [bufferLength]byte
-	tag [tagMaxLength]tag.Tag
+	tag [tagMaxCount]tag.Tag
 	len uint32
 	pos uint32
 }
 
-// bufferPool for buffer
+// bufferPool for tag buffers
 var bufferPool = sync.Pool{
 	New: func() interface{} { return new(buffer) },
 }
@@ -87,11 +87,11 @@ func (b *buffer) resetPosition() {
 // addTagBuffer adds the given tag to the tagBuffer
 func (ir *ifdReader) addTagBuffer(t tag.Tag) {
 	if uint32(t.ValueOffset) < ir.po {
-		ir.logTagWarn(t, "Uncompatible reverse exif tag")
+		ir.logTagWarn(t, "Incompatible reverse exif tag")
 		return
 	}
 	b := ir.buffer
-	if b.len < tagMaxLength {
+	if b.len < tagMaxCount {
 		for i := b.len; i > 0; i-- {
 			if t.ValueOffset > b.tag[i-1].ValueOffset {
 				if i != b.len {
@@ -115,7 +115,7 @@ func (ir *ifdReader) addTagBuffer(t tag.Tag) {
 		}
 	}
 	if ir.logError() {
-		ir.logger.Error().Int32("tagBufferLength", tagMaxLength).Msg("error tagBufferMaxLength is too short")
+		ir.logger.Error().Int32("tagBufferLength", tagMaxCount).Msg("error tagBufferMaxLength is too short")
 	}
 }
 

jpeg/log.go

@@ -8,32 +8,19 @@ import (
 )
 
 var (
-	// DefaultLoggger is the Default Logger, logs only Panic to the console
-	DefaulLogger zerolog.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout}).Level(zerolog.PanicLevel).With().Str("package", "jpeg").Logger()
-	logLevel     zerolog.Level
-	logger       *zerolog.Logger = nil
+	// Logger is the logger
+	Logger zerolog.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout}).Level(zerolog.PanicLevel).With().Str("package", "jpeg").Logger()
 )
 
 func logInfo() bool {
-	return logLevel >= zerolog.InfoLevel
-}
-
-// SetLogger sets the package logger
-func SetLogger(l *zerolog.Logger) {
-	logLevel = l.GetLevel()
-	logger = l
-}
-
-// Logger returns the package logger
-func Logger() *zerolog.Logger {
-	return logger
+	return Logger.GetLevel() <= zerolog.InfoLevel
 }
 
 func (jr *jpegReader) logMarker(str string) {
 	if logInfo() {
 		if len(str) == 0 {
 			str = jr.marker.String()
 		}
-		logger.Info().Str("marker", str).Int("length", int(jr.size)).Uint32("offset", uint32(jr.discarded)).Send()
+		Logger.Info().Str("marker", str).Int("length", int(jr.size)).Uint32("offset", uint32(jr.discarded)).Send()
 	}
 }