From c971b863a0a1f9feb75f31657729db3a03da114c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 1 Jan 2023 19:46:28 -0700 Subject: cmd/btrfs-rec: Add a type-agnostic utility function to write JSON out --- cmd/btrfs-rec/inspect_scandevices.go | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'cmd/btrfs-rec/inspect_scandevices.go') diff --git a/cmd/btrfs-rec/inspect_scandevices.go b/cmd/btrfs-rec/inspect_scandevices.go index 7235e45..bca1b13 100644 --- a/cmd/btrfs-rec/inspect_scandevices.go +++ b/cmd/btrfs-rec/inspect_scandevices.go @@ -1,12 +1,10 @@ -// Copyright (C) 2022 Luke Shumaker +// Copyright (C) 2022-2023 Luke Shumaker // // SPDX-License-Identifier: GPL-2.0-or-later package main import ( - "bufio" - "io" "os" "git.lukeshu.com/go/lowmemjson" @@ -33,7 +31,11 @@ func init() { } dlog.Info(ctx, "Writing scan results to stdout...") - if err := writeScanResults(os.Stdout, results); err != nil { + if err := writeJSONFile(os.Stdout, results, lowmemjson.ReEncoder{ + Indent: "\t", + ForceTrailingNewlines: true, + CompactIfUnder: 16, + }); err != nil { return err } dlog.Info(ctx, "... done writing") @@ -42,19 +44,3 @@ func init() { }, }) } - -func writeScanResults(w io.Writer, results btrfsinspect.ScanDevicesResult) (err error) { - buffer := bufio.NewWriter(w) - defer func() { - if _err := buffer.Flush(); err == nil && _err != nil { - err = _err - } - }() - return lowmemjson.Encode(&lowmemjson.ReEncoder{ - Out: buffer, - - Indent: "\t", - ForceTrailingNewlines: true, - CompactIfUnder: 16, - }, results) -} -- cgit v1.2.3-2-g168b From 97fa22c161056c289a9978f20e3fb6b05d779a23 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 1 Jan 2023 20:48:22 -0700 Subject: lint: Turn on gomnd --- cmd/btrfs-rec/inspect_scandevices.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/btrfs-rec/inspect_scandevices.go') diff --git a/cmd/btrfs-rec/inspect_scandevices.go b/cmd/btrfs-rec/inspect_scandevices.go index bca1b13..410fa4f 100644 --- a/cmd/btrfs-rec/inspect_scandevices.go +++ b/cmd/btrfs-rec/inspect_scandevices.go @@ -34,7 +34,7 @@ func init() { if err := writeJSONFile(os.Stdout, results, lowmemjson.ReEncoder{ Indent: "\t", ForceTrailingNewlines: true, - CompactIfUnder: 16, + CompactIfUnder: 16, //nolint:gomnd // This is what looks Nice. }); err != nil { return err } -- cgit v1.2.3-2-g168b