Rename sif/* files

- Rename  sif/sif_* to remove the sif_ prefix

  The directory name is sufficient disambiguation,
  so decrease the visual noise and repetition.

- Remove the sif/internal subpackage

  We don't need an extra subpackage, just move the code
  to the only user.

  This makes the internal code publicly-visible, we'll
  change that immediately.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2022-01-12 23:35:51 +01:00
parent 67c18a6477
commit 04e1b8d4b6
3 changed files with 3 additions and 4 deletions

View File

@ -1,7 +1,7 @@
//go:build linux
// +build linux
package internal
package sifimage
import (
"bufio"

View File

@ -14,7 +14,6 @@ import (
"time"
"github.com/containers/image/v5/internal/tmpdir"
"github.com/containers/image/v5/sif/internal"
"github.com/containers/image/v5/types"
"github.com/klauspost/pgzip"
"github.com/opencontainers/go-digest"
@ -26,7 +25,7 @@ import (
type sifImageSource struct {
ref sifReference
sifimg internal.SifImage
sifimg SifImage
workdir string
diffID digest.Digest
diffSize int64
@ -108,7 +107,7 @@ func (s *sifImageSource) getBlobInfo() error {
func newImageSource(ctx context.Context, sys *types.SystemContext, ref sifReference) (types.ImageSource, error) {
var imgSrc sifImageSource
sifimg, err := internal.LoadSIFImage(ref.resolvedFile)
sifimg, err := LoadSIFImage(ref.resolvedFile)
if err != nil {
return nil, errors.Wrap(err, "loading SIF file")
}