Move arguments to TossOpts

[nncp.git] / src / cmd / nncp-call / main.go

diff --git a/src/cmd/nncp-call/main.go b/src/cmd/nncp-call/main.go
index 6bcd05da7acc908c07732801980308134bcf8ee7..f21a6e72212979da119273bba413b17c61590f5c 100644 (file)
--- a/src/cmd/nncp-call/main.go
+++ b/src/cmd/nncp-call/main.go
@@ -32,8 +32,8 @@ import (
 )
 
 func usage() {
-       fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-       fmt.Fprintf(os.Stderr, "nncp-call -- call TCP daemon\n\n")
+       fmt.Fprint(os.Stderr, nncp.UsageHeader())
+       fmt.Fprint(os.Stderr, "nncp-call -- call TCP daemon\n\n")
        fmt.Fprintf(os.Stderr, "Usage: %s [options] NODE[:ADDR] [FORCEADDR]\n", os.Args[0])
        fmt.Fprintln(os.Stderr, "Options:")
        flag.PrintDefaults()
@@ -211,14 +211,16 @@ func main() {
        if *autoToss {
                autoTossFinish, autoTossBadCode = ctx.AutoToss(
                        node.Id,
-                       nice,
-                       *autoTossDoSeen,
-                       *autoTossNoFile,
-                       *autoTossNoFreq,
-                       *autoTossNoExec,
-                       *autoTossNoTrns,
-                       *autoTossNoArea,
-                       *autoTossNoACK,
+                       &nncp.TossOpts{
+                               Nice:   nice,
+                               DoSeen: *autoTossDoSeen,
+                               NoFile: *autoTossNoFile,
+                               NoFreq: *autoTossNoFreq,
+                               NoExec: *autoTossNoExec,
+                               NoTrns: *autoTossNoTrns,
+                               NoArea: *autoTossNoArea,
+                               NoACK:  *autoTossNoACK,
+                       },
                )
        }