github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-07-02 17:42:29 +00:00
Code Issues Projects Releases Wiki Activity

Simplify inspectOptions.writeOutput a bit more

Browse Source 
Don't maintain a named array variable that we only append to
exactly once.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2023-02-27 19:34:54 +01:00
parent c345785d28
commit bcc0d54e54
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/skopeo/inspect.go
View File

@ -217,12 +217,10 @@ func (opts *inspectOptions) run(args []string, stdout io.Writer) (retErr error)
return opts.writeOutput(stdout, outputData)
}
// writeOutput writes outputData depending on opts.format to stdout
func (opts *inspectOptions) writeOutput(stdout io.Writer, outputData any) error {
var data []any
// writeOutput writes data depending on opts.format to stdout
func (opts *inspectOptions) writeOutput(stdout io.Writer, data any) error {
if report.IsJSON(opts.format) || opts.format == "" {
out, err := json.MarshalIndent(outputData, "", " ")
out, err := json.MarshalIndent(data, "", " ")
if err == nil {
fmt.Fprintf(stdout, "%s\n", string(out))
}
@ -234,6 +232,5 @@ func (opts *inspectOptions) writeOutput(stdout io.Writer, outputData any) error
return err
}
defer rpt.Flush()
data = append(data, outputData)
return rpt.Execute(data)
return rpt.Execute([]any{data})
}