diff options
Diffstat (limited to 'tinc.go')
| -rw-r--r-- | tinc.go | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -15,11 +15,10 @@ type Error struct { } func (e Error) Error() string { - if e.Line > 0 { - return fmt.Sprintf("%v:%v: %v", e.File, e.Line, e.Err) - } else { + if e.Line < 1 { return fmt.Sprintf("%v: %v", e.File, e.Err) } + return fmt.Sprintf("%v:%v: %v", e.File, e.Line, e.Err) } func parseConfigLine(line string) (key, val string) { @@ -43,7 +42,7 @@ func parseConfigLine(line string) (key, val string) { // a map of settings. Since Tinc setting names are case-insensitive, // the keys in the map are all lower-case. func ReadConfigFile(fname string) (map[string][]string, error) { - config_tree := make(map[string][]string) + cfg := make(map[string][]string) fp, err := os.Open(fname) if err != nil { @@ -83,14 +82,14 @@ func ReadConfigFile(fname string) (map[string][]string, error) { return nil, Error{File: fname, Line: lineno, Err: err} } variable = strings.ToLower(variable) - config_tree[variable] = append(config_tree[variable], value) + cfg[variable] = append(cfg[variable], value) } err = buffer.Err() if err != nil { return nil, Error{File: fname, Err: err} } - return config_tree, nil + return cfg, nil } // GetAddresses inspects a tinc host-confing settings object and |