diff --git a/internal/converter/converter.go b/internal/converter/converter.go index c6262d8..9a18dca 100644 --- a/internal/converter/converter.go +++ b/internal/converter/converter.go @@ -30,8 +30,8 @@ func New() *Converter { order: make([]Order, 0), } - cmdOutput := &strings.Builder{} - cmd.SetOutput(cmdOutput) + var cmdOutput strings.Builder + cmd.SetOutput(&cmdOutput) cmd.Usage = func() { fmt.Fprintf(os.Stderr, "Usage of %s:\n", filepath.Base(os.Args[0])) for _, o := range conv.order { diff --git a/internal/epub/image_processing/epub_image_processing_loader.go b/internal/epub/image_processing/epub_image_processing_loader.go index cdd7117..69a9d39 100644 --- a/internal/epub/image_processing/epub_image_processing_loader.go +++ b/internal/epub/image_processing/epub_image_processing_loader.go @@ -28,16 +28,18 @@ type Options struct { } func (o *Options) mustExtractImage(imageOpener func() (io.ReadCloser, error)) *bytes.Buffer { + var b bytes.Buffer if o.Dry { - return &bytes.Buffer{} + return &b } + f, err := imageOpener() if err != nil { fmt.Fprintln(os.Stderr, err) os.Exit(1) } defer f.Close() - var b bytes.Buffer + _, err = io.Copy(&b, f) if err != nil { fmt.Fprintln(os.Stderr, err)