binstruct: Begone with the indirection of binint

1 files changed, 0 insertions, 258 deletions

diff --git a/lib/binstruct/binint/builtins.go b/lib/binstruct/binint/builtins.go
deleted file mode 100644
index cfd0fc2..0000000
--- a/lib/binstruct/binint/builtins.go
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright (C) 2022-2023  Luke Shumaker <lukeshu@lukeshu.com>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package binint
-
-import (
-	"encoding/binary"
-
-	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct/binutil"
-)
-
-const (
-	sizeof8  = 1
-	sizeof16 = 2
-	sizeof32 = 4
-	sizeof64 = 8
-)
-
-// unsigned
-
-type U8 uint8
-
-func (U8) BinaryStaticSize() int            { return sizeof8 }
-func (x U8) MarshalBinary() ([]byte, error) { return []byte{byte(x)}, nil }
-func (x *U8) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof8); err != nil {
-		return 0, err
-	}
-	*x = U8(dat[0])
-	return sizeof8, nil
-}
-
-// unsigned little endian
-
-type U16le uint16
-
-func (U16le) BinaryStaticSize() int { return sizeof16 }
-func (x U16le) MarshalBinary() ([]byte, error) {
-	var buf [sizeof16]byte
-	binary.LittleEndian.PutUint16(buf[:], uint16(x))
-	return buf[:], nil
-}
-
-func (x *U16le) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof16); err != nil {
-		return 0, err
-	}
-	*x = U16le(binary.LittleEndian.Uint16(dat))
-	return sizeof16, nil
-}
-
-type U32le uint32
-
-func (U32le) BinaryStaticSize() int { return sizeof32 }
-func (x U32le) MarshalBinary() ([]byte, error) {
-	var buf [sizeof32]byte
-	binary.LittleEndian.PutUint32(buf[:], uint32(x))
-	return buf[:], nil
-}
-
-func (x *U32le) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof32); err != nil {
-		return 0, err
-	}
-	*x = U32le(binary.LittleEndian.Uint32(dat))
-	return sizeof32, nil
-}
-
-type U64le uint64
-
-func (U64le) BinaryStaticSize() int { return sizeof64 }
-func (x U64le) MarshalBinary() ([]byte, error) {
-	var buf [sizeof64]byte
-	binary.LittleEndian.PutUint64(buf[:], uint64(x))
-	return buf[:], nil
-}
-
-func (x *U64le) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof64); err != nil {
-		return 0, err
-	}
-	*x = U64le(binary.LittleEndian.Uint64(dat))
-	return sizeof64, nil
-}
-
-// unsigned big endian
-
-type U16be uint16
-
-func (U16be) BinaryStaticSize() int { return sizeof16 }
-func (x U16be) MarshalBinary() ([]byte, error) {
-	var buf [sizeof16]byte
-	binary.BigEndian.PutUint16(buf[:], uint16(x))
-	return buf[:], nil
-}
-
-func (x *U16be) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof16); err != nil {
-		return 0, err
-	}
-	*x = U16be(binary.BigEndian.Uint16(dat))
-	return sizeof16, nil
-}
-
-type U32be uint32
-
-func (U32be) BinaryStaticSize() int { return sizeof32 }
-func (x U32be) MarshalBinary() ([]byte, error) {
-	var buf [sizeof32]byte
-	binary.BigEndian.PutUint32(buf[:], uint32(x))
-	return buf[:], nil
-}
-
-func (x *U32be) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof32); err != nil {
-		return 0, err
-	}
-	*x = U32be(binary.BigEndian.Uint32(dat))
-	return sizeof32, nil
-}
-
-type U64be uint64
-
-func (U64be) BinaryStaticSize() int { return sizeof64 }
-func (x U64be) MarshalBinary() ([]byte, error) {
-	var buf [sizeof64]byte
-	binary.BigEndian.PutUint64(buf[:], uint64(x))
-	return buf[:], nil
-}
-
-func (x *U64be) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof64); err != nil {
-		return 0, err
-	}
-	*x = U64be(binary.BigEndian.Uint64(dat))
-	return sizeof64, nil
-}
-
-// signed
-
-type I8 int8
-
-func (I8) BinaryStaticSize() int            { return sizeof8 }
-func (x I8) MarshalBinary() ([]byte, error) { return []byte{byte(x)}, nil }
-func (x *I8) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof8); err != nil {
-		return 0, err
-	}
-	*x = I8(dat[0])
-	return sizeof8, nil
-}
-
-// signed little endian
-
-type I16le int16
-
-func (I16le) BinaryStaticSize() int { return sizeof16 }
-func (x I16le) MarshalBinary() ([]byte, error) {
-	var buf [sizeof16]byte
-	binary.LittleEndian.PutUint16(buf[:], uint16(x))
-	return buf[:], nil
-}
-
-func (x *I16le) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof16); err != nil {
-		return 0, err
-	}
-	*x = I16le(binary.LittleEndian.Uint16(dat))
-	return sizeof16, nil
-}
-
-type I32le int32
-
-func (I32le) BinaryStaticSize() int { return sizeof32 }
-func (x I32le) MarshalBinary() ([]byte, error) {
-	var buf [sizeof32]byte
-	binary.LittleEndian.PutUint32(buf[:], uint32(x))
-	return buf[:], nil
-}
-
-func (x *I32le) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof32); err != nil {
-		return 0, err
-	}
-	*x = I32le(binary.LittleEndian.Uint32(dat))
-	return sizeof32, nil
-}
-
-type I64le int64
-
-func (I64le) BinaryStaticSize() int { return sizeof64 }
-func (x I64le) MarshalBinary() ([]byte, error) {
-	var buf [sizeof64]byte
-	binary.LittleEndian.PutUint64(buf[:], uint64(x))
-	return buf[:], nil
-}
-
-func (x *I64le) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof64); err != nil {
-		return 0, err
-	}
-	*x = I64le(binary.LittleEndian.Uint64(dat))
-	return sizeof64, nil
-}
-
-// signed big endian
-
-type I16be int16
-
-func (I16be) BinaryStaticSize() int { return sizeof16 }
-func (x I16be) MarshalBinary() ([]byte, error) {
-	var buf [sizeof16]byte
-	binary.BigEndian.PutUint16(buf[:], uint16(x))
-	return buf[:], nil
-}
-
-func (x *I16be) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof16); err != nil {
-		return 0, err
-	}
-	*x = I16be(binary.BigEndian.Uint16(dat))
-	return sizeof16, nil
-}
-
-type I32be int32
-
-func (I32be) BinaryStaticSize() int { return sizeof32 }
-func (x I32be) MarshalBinary() ([]byte, error) {
-	var buf [sizeof32]byte
-	binary.BigEndian.PutUint32(buf[:], uint32(x))
-	return buf[:], nil
-}
-
-func (x *I32be) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof32); err != nil {
-		return 0, err
-	}
-	*x = I32be(binary.BigEndian.Uint32(dat))
-	return sizeof32, nil
-}
-
-type I64be int64
-
-func (I64be) BinaryStaticSize() int { return sizeof64 }
-func (x I64be) MarshalBinary() ([]byte, error) {
-	var buf [sizeof64]byte
-	binary.BigEndian.PutUint64(buf[:], uint64(x))
-	return buf[:], nil
-}
-
-func (x *I64be) UnmarshalBinary(dat []byte) (int, error) {
-	if err := binutil.NeedNBytes(dat, sizeof64); err != nil {
-		return 0, err
-	}
-	*x = I64be(binary.BigEndian.Uint64(dat))
-	return sizeof64, nil
-}