Revert "object/header: Rename from objectheader"

This reverts commit 85f1212724e037e6934203f04a3f6231ac609503.

20 files changed, 44 insertions, 44 deletions

diff --git a/object/blob_serialize.go b/object/blob_serialize.go
index 55240f44..e9c0ac5e 100644
--- a/object/blob_serialize.go
+++ b/object/blob_serialize.go
@@ -3,7 +3,7 @@ package object
 import (
 	"errors"
 
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objecttype"
 )
 
@@ -19,7 +19,7 @@ func (blob *Blob) SerializeWithHeader() ([]byte, error) {
 		return nil, err
 	}
 
-	header, ok := header.Encode(objecttype.TypeBlob, int64(len(body)))
+	header, ok := objectheader.Encode(objecttype.TypeBlob, int64(len(body)))
 	if !ok {
 		return nil, errors.New("object: blob: failed to encode object header")
 	}
diff --git a/object/commit_serialize.go b/object/commit_serialize.go
index 7ff022c4..eef45ef4 100644
--- a/object/commit_serialize.go
+++ b/object/commit_serialize.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objecttype"
 )
 
@@ -71,7 +71,7 @@ func (commit *Commit) SerializeWithHeader() ([]byte, error) {
 		return nil, err
 	}
 
-	header, ok := header.Encode(objecttype.TypeCommit, int64(len(body)))
+	header, ok := objectheader.Encode(objecttype.TypeCommit, int64(len(body)))
 	if !ok {
 		return nil, errors.New("object: commit: failed to encode object header")
 	}
diff --git a/object/parse.go b/object/parse.go
index 54752a5d..9afe5cb8 100644
--- a/object/parse.go
+++ b/object/parse.go
@@ -3,7 +3,7 @@ package object
 import (
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objecttype"
 )
@@ -12,7 +12,7 @@ import (
 //
 //nolint:ireturn
 func ParseObjectWithHeader(raw []byte, algo objectid.Algorithm) (Object, error) {
-	ty, size, headerLen, ok := header.Parse(raw)
+	ty, size, headerLen, ok := objectheader.Parse(raw)
 	if !ok {
 		return nil, fmt.Errorf("object: malformed object header")
 	}
diff --git a/object/tag_serialize.go b/object/tag_serialize.go
index fb212485..1e016cdb 100644
--- a/object/tag_serialize.go
+++ b/object/tag_serialize.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objecttype"
 )
 
@@ -55,7 +55,7 @@ func (tag *Tag) SerializeWithHeader() ([]byte, error) {
 		return nil, err
 	}
 
-	header, ok := header.Encode(objecttype.TypeTag, int64(len(body)))
+	header, ok := objectheader.Encode(objecttype.TypeTag, int64(len(body)))
 	if !ok {
 		return nil, errors.New("object: tag: failed to encode object header")
 	}
diff --git a/object/tree_serialize.go b/object/tree_serialize.go
index 64542a37..42f60f72 100644
--- a/object/tree_serialize.go
+++ b/object/tree_serialize.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"strconv"
 
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objecttype"
 )
 
@@ -42,7 +42,7 @@ func (tree *Tree) SerializeWithHeader() ([]byte, error) {
 		return nil, err
 	}
 
-	header, ok := header.Encode(objecttype.TypeTree, int64(len(body)))
+	header, ok := objectheader.Encode(objecttype.TypeTree, int64(len(body)))
 	if !ok {
 		return nil, errors.New("object: tree: failed to encode object header")
 	}
diff --git a/object/header/append.go b/objectheader/append.go
index 92dbe686..bfccf388 100644
--- a/object/header/append.go
+++ b/objectheader/append.go
@@ -1,4 +1,4 @@
-package header
+package objectheader
 
 import (
 	"strconv"
diff --git a/object/header/encode.go b/objectheader/encode.go
index e0393af6..1cca968b 100644
--- a/object/header/encode.go
+++ b/objectheader/encode.go
@@ -1,4 +1,4 @@
-package header
+package objectheader
 
 import "codeberg.org/lindenii/furgit/objecttype"
 
diff --git a/object/header/parse.go b/objectheader/parse.go
index d0a0ada8..677dffdb 100644
--- a/object/header/parse.go
+++ b/objectheader/parse.go
@@ -1,5 +1,5 @@
-// Package header parses and serializes object headers ("type size\0").
-package header
+// Package objectheader parses and serializes object headers ("type size\0").
+package objectheader
 
 import (
 	"bytes"
diff --git a/objectstore/loose/helpers_test.go b/objectstore/loose/helpers_test.go
index 98d95c52..6cc50163 100644
--- a/objectstore/loose/helpers_test.go
+++ b/objectstore/loose/helpers_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore/loose"
 	"codeberg.org/lindenii/furgit/objecttype"
@@ -54,9 +54,9 @@ func expectedRawObject(t *testing.T, testRepo *testgit.TestRepo, id objectid.Obj
 
 	body := testRepo.CatFile(t, typeName, id)
 
-	header, ok := header.Encode(ty, int64(len(body)))
+	header, ok := objectheader.Encode(ty, int64(len(body)))
 	if !ok {
-		t.Fatalf("header.Encode failed")
+		t.Fatalf("objectheader.Encode failed")
 	}
 
 	raw := make([]byte, len(header)+len(body))
diff --git a/objectstore/loose/parse.go b/objectstore/loose/parse.go
index 9e9e58da..2a41e359 100644
--- a/objectstore/loose/parse.go
+++ b/objectstore/loose/parse.go
@@ -7,7 +7,7 @@ import (
 	"os"
 
 	"codeberg.org/lindenii/furgit/internal/compress/zlib"
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objecttype"
 )
 
@@ -25,7 +25,7 @@ func decodeAll(file *os.File) ([]byte, error) {
 
 // parseRaw parses a loose object payload in "type size\0content" format.
 func parseRaw(raw []byte) (objecttype.Type, []byte, error) {
-	ty, size, headerLen, ok := header.Parse(raw)
+	ty, size, headerLen, ok := objectheader.Parse(raw)
 	if !ok {
 		return objecttype.TypeInvalid, nil, errors.New("objectstore/loose: malformed object header")
 	}
@@ -41,15 +41,15 @@ func parseRaw(raw []byte) (objecttype.Type, []byte, error) {
 // readHeader reads and parses a loose object header from br, and returns
 // the raw header bytes including the trailing NUL.
 func readHeader(br *bufio.Reader) ([]byte, objecttype.Type, int64, error) {
-	h, err := br.ReadSlice(0)
+	header, err := br.ReadSlice(0)
 	if err != nil {
 		return nil, objecttype.TypeInvalid, 0, err
 	}
 
-	ty, size, _, ok := header.Parse(h)
+	ty, size, _, ok := objectheader.Parse(header)
 	if !ok {
 		return nil, objecttype.TypeInvalid, 0, errors.New("objectstore/loose: malformed object header")
 	}
 
-	return h, ty, size, nil
+	return header, ty, size, nil
 }
diff --git a/objectstore/loose/write_reader.go b/objectstore/loose/write_reader.go
index c2b64310..9dbf3818 100644
--- a/objectstore/loose/write_reader.go
+++ b/objectstore/loose/write_reader.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objecttype"
 )
@@ -18,7 +18,7 @@ func (store *Store) WriteReaderContent(ty objecttype.Type, size int64, src io.Re
 		return objectid.ObjectID{}, fmt.Errorf("objectstore/loose: negative content size: %d", size)
 	}
 
-	header, ok := header.Encode(ty, size)
+	header, ok := objectheader.Encode(ty, size)
 	if !ok {
 		return objectid.ObjectID{}, fmt.Errorf("objectstore/loose: failed to encode object header for type %v", ty)
 	}
diff --git a/objectstore/loose/write_test.go b/objectstore/loose/write_test.go
index bf90cde7..a7b12622 100644
--- a/objectstore/loose/write_test.go
+++ b/objectstore/loose/write_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objecttype"
 )
@@ -58,9 +58,9 @@ func TestLooseStoreWriteReaderFullAgainstGit(t *testing.T) {
 
 		body := []byte("full-reader-body\n")
 
-		header, ok := header.Encode(objecttype.TypeBlob, int64(len(body)))
+		header, ok := objectheader.Encode(objecttype.TypeBlob, int64(len(body)))
 		if !ok {
-			t.Fatalf("header.Encode failed")
+			t.Fatalf("objectheader.Encode failed")
 		}
 
 		raw := make([]byte, len(header)+len(body))
diff --git a/objectstore/loose/write_writer_accept.go b/objectstore/loose/write_writer_accept.go
index a2fe848e..707232ba 100644
--- a/objectstore/loose/write_writer_accept.go
+++ b/objectstore/loose/write_writer_accept.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"errors"
 
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 )
 
 // acceptFull validates and accounts raw full-object input.
@@ -15,7 +15,7 @@ func (writer *streamWriter) acceptFull(src []byte) error {
 			headerChunkLen := nul + 1
 			writer.headerBuf = append(writer.headerBuf, src[:headerChunkLen]...)
 
-			_, size, _, ok := header.Parse(writer.headerBuf)
+			_, size, _, ok := objectheader.Parse(writer.headerBuf)
 			if !ok {
 				return errors.New("objectstore/loose: malformed object header")
 			}
diff --git a/objectstore/memory/add.go b/objectstore/memory/add.go
index 47faf210..80d0022f 100644
--- a/objectstore/memory/add.go
+++ b/objectstore/memory/add.go
@@ -1,14 +1,14 @@
 package memory
 
 import (
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objecttype"
 )
 
 // AddObject stores one object body and returns its object ID.
 func (store *Store) AddObject(ty objecttype.Type, body []byte) objectid.ObjectID {
-	header, ok := header.Encode(ty, int64(len(body)))
+	header, ok := objectheader.Encode(ty, int64(len(body)))
 	if !ok {
 		panic("failed to encode object header")
 	}
diff --git a/objectstore/memory/read_bytes.go b/objectstore/memory/read_bytes.go
index 4957df50..31c5b3d1 100644
--- a/objectstore/memory/read_bytes.go
+++ b/objectstore/memory/read_bytes.go
@@ -1,7 +1,7 @@
 package memory
 
 import (
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore"
 	"codeberg.org/lindenii/furgit/objecttype"
@@ -14,7 +14,7 @@ func (store *Store) ReadBytesFull(id objectid.ObjectID) ([]byte, error) {
 		return nil, objectstore.ErrObjectNotFound
 	}
 
-	header, ok := header.Encode(obj.ty, int64(len(obj.content)))
+	header, ok := objectheader.Encode(obj.ty, int64(len(obj.content)))
 	if !ok {
 		panic("failed to encode object header")
 	}
diff --git a/objectstore/packed/helpers_test.go b/objectstore/packed/helpers_test.go
index 63c01c3e..f07ff4e3 100644
--- a/objectstore/packed/helpers_test.go
+++ b/objectstore/packed/helpers_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore/packed"
 	"codeberg.org/lindenii/furgit/objecttype"
@@ -57,9 +57,9 @@ func expectedRawObject(t *testing.T, testRepo *testgit.TestRepo, id objectid.Obj
 
 	body := testRepo.CatFile(t, typeName, id)
 
-	header, ok := header.Encode(ty, int64(len(body)))
+	header, ok := objectheader.Encode(ty, int64(len(body)))
 	if !ok {
-		t.Fatalf("header.Encode failed")
+		t.Fatalf("objectheader.Encode failed")
 	}
 
 	raw := make([]byte, len(header)+len(body))
diff --git a/objectstore/packed/read_bytes.go b/objectstore/packed/read_bytes.go
index 99e6635d..e272b626 100644
--- a/objectstore/packed/read_bytes.go
+++ b/objectstore/packed/read_bytes.go
@@ -3,7 +3,7 @@ package packed
 import (
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objecttype"
 )
@@ -25,7 +25,7 @@ func (store *Store) ReadBytesFull(id objectid.ObjectID) ([]byte, error) {
 		return nil, err
 	}
 
-	header, ok := header.Encode(ty, int64(len(content)))
+	header, ok := objectheader.Encode(ty, int64(len(content)))
 	if !ok {
 		return nil, fmt.Errorf("objectstore/packed: failed to encode object header for type %d", ty)
 	}
diff --git a/objectstore/packed/read_reader.go b/objectstore/packed/read_reader.go
index 12c8cc14..cbecaf2c 100644
--- a/objectstore/packed/read_reader.go
+++ b/objectstore/packed/read_reader.go
@@ -6,7 +6,7 @@ import (
 	"io"
 
 	"codeberg.org/lindenii/furgit/internal/iolimit"
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objecttype"
 	packfmt "codeberg.org/lindenii/furgit/packfile"
@@ -61,7 +61,7 @@ func (store *Store) ReadReaderFull(id objectid.ObjectID) (io.ReadCloser, error)
 	}
 
 	if packfmt.IsBaseObjectType(meta.ty) {
-		header, ok := header.Encode(meta.ty, meta.size)
+		header, ok := objectheader.Encode(meta.ty, meta.size)
 		if !ok {
 			return nil, fmt.Errorf("objectstore/packed: failed to encode object header for type %d", meta.ty)
 		}
diff --git a/packfile/ingest/drain.go b/packfile/ingest/drain.go
index 74d2f90c..ce04fcb4 100644
--- a/packfile/ingest/drain.go
+++ b/packfile/ingest/drain.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	"codeberg.org/lindenii/furgit/internal/compress/zlib"
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objecttype"
 	packfmt "codeberg.org/lindenii/furgit/packfile"
@@ -26,7 +26,7 @@ func drainEntryPayload(state *ingestState, record objectRecord) (int64, objectid
 	var total int64
 
 	if packfmt.IsBaseObjectType(record.packedType) {
-		header, ok := header.Encode(record.packedType, record.declaredSize)
+		header, ok := objectheader.Encode(record.packedType, record.declaredSize)
 		if !ok {
 			return 0, zero, &MalformedPackEntryError{Offset: record.offset, Reason: "encode object header"}
 		}
diff --git a/packfile/ingest/hash.go b/packfile/ingest/hash.go
index 0b8615cd..83df55c5 100644
--- a/packfile/ingest/hash.go
+++ b/packfile/ingest/hash.go
@@ -3,14 +3,14 @@ package ingest
 import (
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/object/header"
+	"codeberg.org/lindenii/furgit/objectheader"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objecttype"
 )
 
 // hashCanonicalObject hashes canonical object bytes (header+content).
 func hashCanonicalObject(algo objectid.Algorithm, ty objecttype.Type, content []byte) (objectid.ObjectID, error) {
-	header, ok := header.Encode(ty, int64(len(content)))
+	header, ok := objectheader.Encode(ty, int64(len(content)))
 	if !ok {
 		return objectid.ObjectID{}, fmt.Errorf("packfile/ingest: encode object header for type %d", ty)
 	}