Use pools.Copy for archive file copy operations

akx · akx · commit 367125e0cc22 · 2024-10-08T12:47:41.000+03:00
Signed-off-by: Aarni Koskela &lt;akx@iki.fi&gt;
diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go
@@ -654,7 +654,7 @@ func (ta *tarAppender) addTarFile(path, name string) error {
 
 		ta.Buffer.Reset(ta.TarWriter)
 		defer ta.Buffer.Reset(nil)
-		_, err = io.Copy(ta.Buffer, file)
+		_, err = pools.Copy(ta.Buffer, file)
 		file.Close()
 		if err != nil {
 			return err
@@ -705,7 +705,7 @@ func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, o
 		if err != nil {
 			return err
 		}
-		if _, err := io.Copy(file, reader); err != nil {
+		if _, err := pools.Copy(file, reader); err != nil {
 			file.Close()
 			return err
 		}
@@ -1375,7 +1375,7 @@ func (archiver *Archiver) CopyFileWithTar(src, dst string) (err error) {
 			if err := tw.WriteHeader(hdr); err != nil {
 				return err
 			}
-			if _, err := io.Copy(tw, srcF); err != nil {
+			if _, err := pools.Copy(tw, srcF); err != nil {
 				return err
 			}
 			return nil

Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,7 @@ func (ta *tarAppender) addTarFile(path, name string) error {`
`654`	`654`
`655`	`655`	`ta.Buffer.Reset(ta.TarWriter)`
`656`	`656`	`defer ta.Buffer.Reset(nil)`
`657`		`- _, err = io.Copy(ta.Buffer, file)`
	`657`	`+ _, err = pools.Copy(ta.Buffer, file)`
`658`	`658`	`file.Close()`
`659`	`659`	`if err != nil {`
`660`	`660`	`return err`
`@@ -705,7 +705,7 @@ func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, o`
`705`	`705`	`if err != nil {`
`706`	`706`	`return err`
`707`	`707`	`}`
`708`		`- if _, err := io.Copy(file, reader); err != nil {`
	`708`	`+ if _, err := pools.Copy(file, reader); err != nil {`
`709`	`709`	`file.Close()`
`710`	`710`	`return err`
`711`	`711`	`}`
`@@ -1375,7 +1375,7 @@ func (archiver *Archiver) CopyFileWithTar(src, dst string) (err error) {`
`1375`	`1375`	`if err := tw.WriteHeader(hdr); err != nil {`
`1376`	`1376`	`return err`
`1377`	`1377`	`}`
`1378`		`- if _, err := io.Copy(tw, srcF); err != nil {`
	`1378`	`+ if _, err := pools.Copy(tw, srcF); err != nil {`
`1379`	`1379`	`return err`
`1380`	`1380`	`}`
`1381`	`1381`	`return nil`