perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

all: Revert the underscore sillyness

Browse Source
This commit is contained in:
Jakob Borg
2019-02-02 12:16:27 +01:00
parent 9fd270d78e
commit c2ddc83509
70 changed files with 252 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/config/config.go
View File

@@ -71,9 +71,9 @@ func New(myID protocol.DeviceID) Configuration {
cfg.Version = CurrentVersion
cfg.OriginalVersion = CurrentVersion
_ = util.SetDefaults(&cfg)
_ = util.SetDefaults(&cfg.Options)
_ = util.SetDefaults(&cfg.GUI)
util.SetDefaults(&cfg)
util.SetDefaults(&cfg.Options)
util.SetDefaults(&cfg.GUI)
// Can't happen.
if err := cfg.prepare(myID); err != nil {
@@ -86,9 +86,9 @@ func New(myID protocol.DeviceID) Configuration {
func ReadXML(r io.Reader, myID protocol.DeviceID) (Configuration, error) {
var cfg Configuration
_ = util.SetDefaults(&cfg)
_ = util.SetDefaults(&cfg.Options)
_ = util.SetDefaults(&cfg.GUI)
util.SetDefaults(&cfg)
util.SetDefaults(&cfg.Options)
util.SetDefaults(&cfg.GUI)
if err := xml.NewDecoder(r).Decode(&cfg); err != nil {
return Configuration{}, err
@@ -104,9 +104,9 @@ func ReadXML(r io.Reader, myID protocol.DeviceID) (Configuration, error) {
func ReadJSON(r io.Reader, myID protocol.DeviceID) (Configuration, error) {
var cfg Configuration
_ = util.SetDefaults(&cfg)
_ = util.SetDefaults(&cfg.Options)
_ = util.SetDefaults(&cfg.GUI)
util.SetDefaults(&cfg)
util.SetDefaults(&cfg.Options)
util.SetDefaults(&cfg.GUI)
bs, err := ioutil.ReadAll(r)
if err != nil {
@@ -211,7 +211,7 @@ found:
}
func (cfg *Configuration) clean() error {
_ = util.FillNilSlices(&cfg.Options)
util.FillNilSlices(&cfg.Options)
// Prepare folders and check for duplicates. Duplicates are bad and
// dangerous, can't currently be resolved in the GUI, and shouldn't
@@ -477,7 +477,7 @@ func convertV22V23(cfg *Configuration) {
err = fs.Remove(DefaultMarkerName)
if err == nil {
err = fs.Mkdir(DefaultMarkerName, permBits)
_ = fs.Hide(DefaultMarkerName) // ignore error
fs.Hide(DefaultMarkerName) // ignore error
}
if err != nil {
l.Infoln("Failed to upgrade folder marker:", err)
@@ -810,13 +810,13 @@ func cleanSymlinks(filesystem fs.Filesystem, dir string) {
// should leave alone. Deduplicated files, for example.
return
}
_ = filesystem.Walk(dir, func(path string, info fs.FileInfo, err error) error {
filesystem.Walk(dir, func(path string, info fs.FileInfo, err error) error {
if err != nil {
return err
}
if info.IsSymlink() {
l.Infoln("Removing incorrectly versioned symlink", path)
_ = filesystem.Remove(path)
filesystem.Remove(path)
return fs.SkipDir
}
return nil

6
lib/config/config_test.go
View File

@@ -548,7 +548,7 @@ func TestPrepare(t *testing.T) {
t.Error("Expected nil")
}
_ = cfg.prepare(device1)
cfg.prepare(device1)
if cfg.Folders == nil || cfg.Devices == nil || cfg.Options.ListenAddresses == nil {
t.Error("Unexpected nil")
@@ -627,7 +627,7 @@ func TestPullOrder(t *testing.T) {
buf := new(bytes.Buffer)
cfg := wrapper.RawCopy()
_ = cfg.WriteXML(buf)
cfg.WriteXML(buf)
t.Logf("%s", buf.Bytes())
@@ -1080,7 +1080,7 @@ func TestDeviceConfigObservedNotNil(t *testing.T) {
},
}
_ = cfg.prepare(device1)
cfg.prepare(device1)
for _, dev := range cfg.Devices {
if dev.IgnoredFolders == nil {

2
lib/config/folderconfiguration.go
View File

@@ -142,7 +142,7 @@ func (f *FolderConfiguration) CreateMarker() error {
} else if err := dir.Sync(); err != nil {
l.Debugln("folder marker: fsync . failed:", err)
}
_ = fs.Hide(DefaultMarkerName)
fs.Hide(DefaultMarkerName)
return nil
}

4
lib/config/wrapper.go
View File

@@ -448,7 +448,7 @@ func (w *Wrapper) MyName() string {
}
func (w *Wrapper) AddOrUpdatePendingDevice(device protocol.DeviceID, name, address string) {
defer func() { _ = w.Save() }()
defer w.Save()
w.mut.Lock()
defer w.mut.Unlock()
@@ -471,7 +471,7 @@ func (w *Wrapper) AddOrUpdatePendingDevice(device protocol.DeviceID, name, addre
}
func (w *Wrapper) AddOrUpdatePendingFolder(id, label string, device protocol.DeviceID) {
defer func() { _ = w.Save() }()
defer w.Save()
w.mut.Lock()
defer w.mut.Unlock()