From 8630ab3a2fb3e6a5518156bc43bd4f6a81f21198 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Tue, 10 Mar 2026 14:20:30 +0800 Subject: Revert "object/header: Rename from objectheader" This reverts commit 85f1212724e037e6934203f04a3f6231ac609503. --- object/blob_serialize.go | 4 ++-- object/commit_serialize.go | 4 ++-- object/header/append.go | 29 ----------------------------- object/header/encode.go | 8 -------- object/header/parse.go | 43 ------------------------------------------- object/parse.go | 4 ++-- object/tag_serialize.go | 4 ++-- object/tree_serialize.go | 4 ++-- 8 files changed, 10 insertions(+), 90 deletions(-) delete mode 100644 object/header/append.go delete mode 100644 object/header/encode.go delete mode 100644 object/header/parse.go (limited to 'object') 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/header/append.go b/object/header/append.go deleted file mode 100644 index 92dbe686..00000000 --- a/object/header/append.go +++ /dev/null @@ -1,29 +0,0 @@ -package header - -import ( - "strconv" - - "codeberg.org/lindenii/furgit/objecttype" -) - -// Append appends a canonical loose-object header ("type size\\x00") to dst. -func Append(dst []byte, ty objecttype.Type, size int64) ([]byte, bool) { - if size < 0 { - return nil, false - } - - tyName, ok := objecttype.Name(ty) - if !ok { - return nil, false - } - - sizeStr := strconv.FormatInt(size, 10) - out := make([]byte, 0, len(dst)+len(tyName)+len(sizeStr)+2) - out = append(out, dst...) - out = append(out, tyName...) - out = append(out, ' ') - out = append(out, sizeStr...) - out = append(out, 0) - - return out, true -} diff --git a/object/header/encode.go b/object/header/encode.go deleted file mode 100644 index e0393af6..00000000 --- a/object/header/encode.go +++ /dev/null @@ -1,8 +0,0 @@ -package header - -import "codeberg.org/lindenii/furgit/objecttype" - -// Encode returns a canonical loose-object header ("type size\\x00"). -func Encode(ty objecttype.Type, size int64) ([]byte, bool) { - return Append(nil, ty, size) -} diff --git a/object/header/parse.go b/object/header/parse.go deleted file mode 100644 index d0a0ada8..00000000 --- a/object/header/parse.go +++ /dev/null @@ -1,43 +0,0 @@ -// Package header parses and serializes object headers ("type size\0"). -package header - -import ( - "bytes" - "strconv" - - "codeberg.org/lindenii/furgit/objecttype" -) - -// Parse parses a canonical loose-object header ("type size\\x00"). -// It returns the parsed type, size, bytes consumed (including trailing NUL), -// and whether parsing succeeded. -func Parse(data []byte) (objecttype.Type, int64, int, bool) { - space := bytes.IndexByte(data, ' ') - if space <= 0 { - return objecttype.TypeInvalid, 0, 0, false - } - - nulRel := bytes.IndexByte(data[space+1:], 0) - if nulRel < 0 { - return objecttype.TypeInvalid, 0, 0, false - } - - nul := space + 1 + nulRel - - ty, ok := objecttype.ParseName(string(data[:space])) - if !ok { - return objecttype.TypeInvalid, 0, 0, false - } - - sizeBytes := data[space+1 : nul] - if len(sizeBytes) == 0 { - return objecttype.TypeInvalid, 0, 0, false - } - - size, err := strconv.ParseInt(string(sizeBytes), 10, 64) - if err != nil || size < 0 { - return objecttype.TypeInvalid, 0, 0, false - } - - return ty, size, nul + 1, true -} 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") } -- cgit v1.3.1-10-gc9f91