summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deserialize.fmt4
-rw-r--r--internal/mkserialize/mkserialize.go2
-rw-r--r--serialize.go22
-rw-r--r--zerialize.go7
4 files changed, 14 insertions, 21 deletions
diff --git a/deserialize.fmt b/deserialize.fmt
index 9302344..5d7b192 100644
--- a/deserialize.fmt
+++ b/deserialize.fmt
@@ -99,7 +99,7 @@ PointedThing {
chk(err)
(*p)[i] = msg
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
}
@@ -111,6 +111,6 @@ PointedThing {
(*p)[i].deserialize(r)
}
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
diff --git a/internal/mkserialize/mkserialize.go b/internal/mkserialize/mkserialize.go
index 4535aaa..bd2ead2 100644
--- a/internal/mkserialize/mkserialize.go
+++ b/internal/mkserialize/mkserialize.go
@@ -122,7 +122,7 @@ func structPragma(c *ast.Comment, sp *[]func(), expr string, de bool) {
*sp = append(*sp, func() {
if de {
fmt.Println("if r.N > 0",
- `{ chk(mkDeTrailingDataError(r)) }`)
+ `{ chk(fmt.Errorf("%d bytes of trailing data", r.N)) }`)
} else {
fmt.Println("{")
fmt.Println("buf := w")
diff --git a/serialize.go b/serialize.go
index e22a7a1..f0ab39d 100644
--- a/serialize.go
+++ b/serialize.go
@@ -834,7 +834,7 @@ func (obj *ToSrvInteract) deserialize(r io.Reader) {
}
}
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
if err := pcall(func() {
@@ -3675,14 +3675,14 @@ func (obj *ToCltNodeDefs) deserialize(r io.Reader) {
(*p)[i].deserialize(r)
}
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
}
chk(r.Close())
}
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
}
@@ -4101,7 +4101,7 @@ func (obj *ToCltItemDefs) deserialize(r io.Reader) {
chk(r.Close())
}
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
}
@@ -18295,7 +18295,7 @@ func (obj *ToCltNodeMetasChanged) deserialize(r io.Reader) {
}
}
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
}
@@ -28748,7 +28748,7 @@ func (obj *NodeDef) deserialize(r io.Reader) {
}
}
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
}
@@ -29711,7 +29711,7 @@ func (obj *AOAdd) deserialize(r io.Reader) {
chk(fmt.Errorf("%s: %w", "github.com/HimbeerserverDE/mt.AOInitData", err))
}
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
}
@@ -29791,7 +29791,7 @@ func (obj *IDAOMsg) deserialize(r io.Reader) {
}
}
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
}
@@ -32485,7 +32485,7 @@ func (obj *ItemDef) deserialize(r io.Reader) {
chk(fmt.Errorf("%s: %w", "github.com/HimbeerserverDE/mt.SoundDef", err))
}
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
}
@@ -41160,7 +41160,7 @@ func (obj *AOInitData) deserialize(r io.Reader) {
chk(err)
(*p)[i] = msg
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
}
@@ -41778,7 +41778,7 @@ func (obj *ToolCaps) deserialize(r io.Reader) {
}
}
if r.N > 0 {
- chk(mkDeTrailingDataError(r))
+ chk(fmt.Errorf("%d bytes of trailing data", r.N))
}
}
}
diff --git a/zerialize.go b/zerialize.go
index bd4339f..0e07bec 100644
--- a/zerialize.go
+++ b/zerialize.go
@@ -8,8 +8,6 @@ import (
"encoding/binary"
"errors"
"io"
-
- "github.com/HimbeerserverDE/mt/rudp"
)
// ErrTooLong reports a length that is too long to serialize.
@@ -56,8 +54,3 @@ func chk(err error) {
panic(serializationError{err})
}
}
-
-func mkDeTrailingDataError(r io.Reader) error {
- buf, _ := io.ReadAll(r)
- return rudp.TrailingDataError(buf)
-}