From 7263cd226f48c210c39b4e3ce7c03b7dab0ea8aa Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 10 Sep 2024 11:52:48 +0200 Subject: [PATCH] image/tarexport: saveSession.save: inline variables Remove some intermediate variables that were only used in a single place. Signed-off-by: Sebastiaan van Stijn --- image/tarexport/save.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/image/tarexport/save.go b/image/tarexport/save.go index 13b978012c..8f2d4cd805 100644 --- a/image/tarexport/save.go +++ b/image/tarexport/save.go @@ -237,7 +237,7 @@ func (s *saveSession) save(ctx context.Context, outStream io.Writer) error { }) } - m := ocispec.Manifest{ + data, err := json.Marshal(ocispec.Manifest{ Versioned: specs.Versioned{ SchemaVersion: 2, }, @@ -248,9 +248,7 @@ func (s *saveSession) save(ctx context.Context, outStream io.Writer) error { Size: int64(len(imageDescr.image.RawJSON())), }, Layers: foreign, - } - - data, err := json.Marshal(m) + }) if err != nil { return errors.Wrap(err, "error marshaling manifest") } @@ -269,12 +267,11 @@ func (s *saveSession) save(ctx context.Context, outStream io.Writer) error { if err := system.Chtimes(mFile, time.Unix(0, 0), time.Unix(0, 0)); err != nil { return errors.Wrap(err, "error setting blob directory timestamps") } - size := int64(len(data)) untaggedMfstDesc := ocispec.Descriptor{ MediaType: ocispec.MediaTypeImageManifest, Digest: dgst, - Size: size, + Size: int64(len(data)), } for _, ref := range imageDescr.refs { familiarName := reference.FamiliarName(ref)