improve buffer usage

This commit is contained in:
Celogeek 2023-04-25 11:15:23 +02:00
parent 9da0887334
commit dbec9b81e8
Signed by: celogeek
SSH Key Fingerprint: SHA256:njNJLzoLQdbV9PC6ehcruRb0QnEgxABoCYZ+0+aUIYc
2 changed files with 6 additions and 4 deletions

View File

@ -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 {

View File

@ -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)