2111386ee4
I'm working through linter complaints, these are some fixes. Broad categories: 1) Ignore errors where we can ignore errors: add "_ = ..." construct. you can argue that this is annoying noise, but apart from silencing the linter it *does* serve the purpose of highlighting that an error is being ignored. I think this is OK, because the linter highlighted some error cases I wasn't aware of (starting CPU profiles, for example). 2) Untyped constants where we though we had set the type. 3) A real bug where we ineffectually assigned to a shadowed err. 4) Some dead code removed. There'll be more of these, because not all packages are fixed, but the diff was already large enough.
58 lines
1.1 KiB
Go
58 lines
1.1 KiB
Go
// Copyright (C) 2014 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
"text/tabwriter"
|
|
)
|
|
|
|
func optionTable(w io.Writer, rows [][]string) {
|
|
tw := tabwriter.NewWriter(w, 2, 4, 2, ' ', 0)
|
|
for _, row := range rows {
|
|
for i, cell := range row {
|
|
if i > 0 {
|
|
_, _ = tw.Write([]byte("\t"))
|
|
}
|
|
_, _ = tw.Write([]byte(cell))
|
|
}
|
|
_, _ = tw.Write([]byte("\n"))
|
|
}
|
|
tw.Flush()
|
|
}
|
|
|
|
func usageFor(fs *flag.FlagSet, usage string, extra string) func() {
|
|
return func() {
|
|
var b bytes.Buffer
|
|
b.WriteString("Usage:\n " + usage + "\n")
|
|
|
|
var options [][]string
|
|
fs.VisitAll(func(f *flag.Flag) {
|
|
var opt = " -" + f.Name
|
|
|
|
if f.DefValue != "false" {
|
|
opt += "=" + fmt.Sprintf(`"%s"`, f.DefValue)
|
|
}
|
|
options = append(options, []string{opt, f.Usage})
|
|
})
|
|
|
|
if len(options) > 0 {
|
|
b.WriteString("\nOptions:\n")
|
|
optionTable(&b, options)
|
|
}
|
|
|
|
fmt.Println(b.String())
|
|
|
|
if len(extra) > 0 {
|
|
fmt.Println(extra)
|
|
}
|
|
}
|
|
}
|