From c65d6effc26c3d97a6193f65c5b7698c830d9ff0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker <lukeshu@lukeshu.com> Date: Fri, 6 Jan 2023 00:52:43 -0700 Subject: btrfssum: Don't emit JSON strings that are too long Split it, and wrap it in an array. --- lib/btrfs/btrfssum/shortsum.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/btrfs/btrfssum/shortsum.go') diff --git a/lib/btrfs/btrfssum/shortsum.go b/lib/btrfs/btrfssum/shortsum.go index 490c40a..a3a6d11 100644 --- a/lib/btrfs/btrfssum/shortsum.go +++ b/lib/btrfs/btrfssum/shortsum.go @@ -11,6 +11,7 @@ import ( "git.lukeshu.com/go/lowmemjson" "git.lukeshu.com/btrfs-progs-ng/lib/jsonutil" + "git.lukeshu.com/btrfs-progs-ng/lib/textui" ) type ShortSum string @@ -27,12 +28,12 @@ func (sum ShortSum) ToFullSum() CSum { } func (sum ShortSum) EncodeJSON(w io.Writer) error { - return jsonutil.EncodeHexString(w, sum) + return jsonutil.EncodeSplitHexString(w, sum, textui.Tunable(80)) } func (sum *ShortSum) DecodeJSON(r io.RuneScanner) error { var out strings.Builder - if err := jsonutil.DecodeHexString(r, &out); err != nil { + if err := jsonutil.DecodeSplitHexString(r, &out); err != nil { return err } *sum = ShortSum(out.String()) -- cgit v1.2.3-2-g168b