appendedzip: OpenReader->NewReader (consistency with archive/zip)

spyre-project · Dec 23, 2021 · 9b326d7 · 9b326d7
1 parent 9119791
commit 9b326d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/appendedzip/appendedzip.go b/appendedzip/appendedzip.go
@@ -18,14 +18,14 @@ func OpenFile(file string) (*zip.Reader, error) {
 	if err != nil {
 		return nil, err
 	}
-	return OpenReader(f, fi.Size())
+	return NewReader(f, fi.Size())
 }
 
-// OpenReader searches for ZIP beginning-of-file signatures ('P' 'K'
+// NewReader searches for ZIP beginning-of-file signatures ('P' 'K'
 // 03 04) in r and tries to read the file starting at that offset
 // using an encryption-enabled archive/zip, returning a *zip.Reader
 // for the first valid entry, or an error.
-func OpenReader(r io.ReaderAt, size int64) (*zip.Reader, error) {
+func NewReader(r io.ReaderAt, size int64) (*zip.Reader, error) {
 	const BUFSIZE = 4096
 	var buf [BUFSIZE + 4]byte
 	for i := int64(0); (i-1)*BUFSIZE < size; i++ {

diff --git a/appendedzip/appendedzip_test.go b/appendedzip/appendedzip_test.go
@@ -1,8 +1,7 @@
 package appendedzip
 
 import (
-	"github.com/hillu/go-archive-zip-crypto"
-
+	"archive/zip"
 	"os"
 	"testing"
 )
@@ -29,7 +28,7 @@ func TestAppendedZip(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		zr, err := OpenReader(f, fi.Size())
+		zr, err := NewReader(f, fi.Size())
 		if err != nil {
 			t.Error(err)
 		} else {