Unify lengths

4 files changed, 7 insertions, 11 deletions

diff --git a/object/fetch/blob.go b/object/fetch/blob.go
index 9af34922..d40ec875 100644
--- a/object/fetch/blob.go
+++ b/object/fetch/blob.go
@@ -32,7 +32,7 @@ func (fetcher *Fetcher) ExactBlob(id oid.ObjectID) (*stored.Stored[*blob.Blob],
 // together with its content size in bytes.
 //
 // Labels: Life-Parent, Close-Caller.
-func (fetcher *Fetcher) ExactBlobReader(id oid.ObjectID) (io.ReadCloser, uint64, error) {
+func (fetcher *Fetcher) ExactBlobReader(id oid.ObjectID) (io.ReadCloser, int, error) {
 	return fetcher.exactReader(id, typ.Blob)
 }
 
@@ -87,7 +87,7 @@ func (fetcher *Fetcher) PeelToBlobID(id oid.ObjectID) (oid.ObjectID, error) {
 // together with its content size in bytes.
 //
 // Labels: Life-Parent, Close-Caller.
-func (fetcher *Fetcher) PeelToBlobReader(id oid.ObjectID) (io.ReadCloser, uint64, error) {
+func (fetcher *Fetcher) PeelToBlobReader(id oid.ObjectID) (io.ReadCloser, int, error) {
 	blobID, err := fetcher.PeelToBlobID(id)
 	if err != nil {
 		return nil, 0, err
diff --git a/object/fetch/header.go b/object/fetch/header.go
index 7a8df483..ee02ef69 100644
--- a/object/fetch/header.go
+++ b/object/fetch/header.go
@@ -8,7 +8,7 @@ import (
 // Header returns the object type and content size at id.
 //
 // Labels: Life-Parent.
-func (fetcher *Fetcher) Header(id oid.ObjectID) (typ.Type, uint64, error) {
+func (fetcher *Fetcher) Header(id oid.ObjectID) (typ.Type, int, error) {
 	ty, size, err := fetcher.store.ReadHeader(id)
 	if err != nil {
 		return typ.Unknown, 0, wrapObjectReadError(id, err)
@@ -20,7 +20,7 @@ func (fetcher *Fetcher) Header(id oid.ObjectID) (typ.Type, uint64, error) {
 // Size returns the object content size at id.
 //
 // Labels: Life-Parent.
-func (fetcher *Fetcher) Size(id oid.ObjectID) (uint64, error) {
+func (fetcher *Fetcher) Size(id oid.ObjectID) (int, error) {
 	size, err := fetcher.store.ReadSize(id)
 	if err != nil {
 		return 0, wrapObjectReadError(id, err)
diff --git a/object/fetch/reader.go b/object/fetch/reader.go
index 8baf1119..b1b4f7c2 100644
--- a/object/fetch/reader.go
+++ b/object/fetch/reader.go
@@ -10,7 +10,7 @@ import (
 
 // exactReader reads one object's content stream
 // and verifies that its header type matches wantType.
-func (fetcher *Fetcher) exactReader(id oid.ObjectID, wantType typ.Type) (io.ReadCloser, uint64, error) {
+func (fetcher *Fetcher) exactReader(id oid.ObjectID, wantType typ.Type) (io.ReadCloser, int, error) {
 	gotType, size, rc, err := fetcher.store.ReadReaderContent(id)
 	if err != nil {
 		return nil, 0, wrapObjectReadError(id, err)
diff --git a/object/fetch/treefs.go b/object/fetch/treefs.go
index da92af51..9d88abb2 100644
--- a/object/fetch/treefs.go
+++ b/object/fetch/treefs.go
@@ -11,7 +11,6 @@ import (
 	oid "lindenii.org/go/furgit/object/id"
 	"lindenii.org/go/furgit/object/tree"
 	"lindenii.org/go/furgit/object/tree/mode"
-	"lindenii.org/go/lgo/intconv"
 )
 
 // TreeFS exposes one Git tree as an fs.FS view backed by a Fetcher.
@@ -69,7 +68,7 @@ func (entry treeEntryValue) isDir() bool {
 	return entry.mode == mode.Directory
 }
 
-func (entry treeEntryValue) blobSize(fetcher *Fetcher) (uint64, error) {
+func (entry treeEntryValue) blobSize(fetcher *Fetcher) (int, error) {
 	return fetcher.Size(entry.objectID)
 }
 
@@ -434,10 +433,7 @@ func (treeFS *TreeFS) statEntry(entry treeEntryValue) (*treeFSInfo, error) {
 			return nil, err
 		}
 
-		size, err = intconv.Uint64ToInt64(sz)
-		if err != nil {
-			return nil, fmt.Errorf("object/fetch: blob size overflows int64: %w", err)
-		}
+		size = int64(sz)
 	}
 
 	var sys any