security/fortify
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

fortify: move json indent call
All checks were successful
Tests / Go tests (push) Successful in 36s
Details
Nix / NixOS tests (push) Successful in 3m2s
Details

Browse Source 
Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2024-12-21 18:51:59 +09:00
parent df7f692e61
commit e08c48cf3d
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
1 changed files with 117 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
print.go
View File

@ -15,18 +15,15 @@ import (
func printShow(instance *state.State, config *fst.Config) { func printShow(instance *state.State, config *fst.Config) {
if flagJSON { if flagJSON {
v := interface{}(config) v := any(config)
if instance != nil { if instance != nil {
v = instance v = instance
} }
if s, err := json.MarshalIndent(v, "", " "); err != nil { printJSON(v)
fmsg.Fatalf("cannot serialise as JSON: %v", err) return
panic("unreachable")
} else {
fmt.Println(string(s))
} }
} else {
buf := new(strings.Builder) buf := new(strings.Builder)
w := tabwriter.NewWriter(buf, 0, 1, 4, ' ', 0) w := tabwriter.NewWriter(buf, 0, 1, 4, ' ', 0)
@ -139,5 +136,13 @@ func printShow(instance *state.State, config *fst.Config) {
fmsg.Fatalf("cannot flush tabwriter: %v", err) fmsg.Fatalf("cannot flush tabwriter: %v", err)
} }
fmt.Print(buf.String()) fmt.Print(buf.String())
}
func printJSON(v any) {
if s, err := json.MarshalIndent(v, "", " "); err != nil {
fmsg.Fatalf("cannot serialise as JSON: %v", err)
panic("unreachable")
} else {
fmt.Println(string(s))
} }
} }