From c2ddc835095d9d82a79524bfd80a104db98b61f6 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sat, 2 Feb 2019 12:16:27 +0100 Subject: [PATCH] all: Revert the underscore sillyness --- cmd/stgenfiles/main.go | 2 +- cmd/syncthing/auditservice.go | 2 +- cmd/syncthing/cpuusage_unix.go | 2 +- cmd/syncthing/gui.go | 12 +++---- cmd/syncthing/gui_statics.go | 2 +- cmd/syncthing/gui_test.go | 4 +-- cmd/syncthing/heapprof.go | 2 +- cmd/syncthing/main.go | 18 +++++----- cmd/syncthing/mocked_config_test.go | 2 +- cmd/syncthing/monitor.go | 18 +++++----- cmd/syncthing/monitor_test.go | 2 +- cmd/syncthing/usage.go | 6 ++-- cmd/syncthing/usage_report.go | 2 +- lib/beacon/broadcast.go | 4 +-- lib/beacon/multicast.go | 4 +-- lib/config/config.go | 26 +++++++-------- lib/config/config_test.go | 6 ++-- lib/config/folderconfiguration.go | 2 +- lib/config/wrapper.go | 4 +-- lib/connections/limiter.go | 6 ++-- lib/connections/service.go | 12 +++---- lib/connections/structs.go | 4 +-- lib/connections/tcp_listen.go | 2 +- lib/db/db_test.go | 4 +-- lib/db/namespaced.go | 14 ++++---- lib/db/set.go | 8 ++--- lib/db/smallindex.go | 4 +-- lib/db/transactions.go | 2 +- lib/db/util_test.go | 4 +-- lib/dialer/internal.go | 4 +-- lib/discover/cache_test.go | 2 +- lib/discover/global_test.go | 2 +- lib/events/events_test.go | 2 +- lib/fs/basicfs_test.go | 8 ++--- lib/fs/basicfs_watch_test.go | 6 ++-- lib/fs/fakefs.go | 12 +++---- lib/fs/fakefs_test.go | 6 ++-- lib/fs/mtimefs.go | 2 +- lib/fs/mtimefs_test.go | 14 ++++---- lib/fs/tempname.go | 2 +- lib/ignore/ignore.go | 8 ++--- lib/ignore/ignore_test.go | 28 ++++++++-------- lib/logger/logger.go | 20 +++++------ lib/model/folder_sendrecv.go | 10 +++--- lib/model/model.go | 24 ++++++------- lib/nat/service.go | 2 +- lib/osutil/atomic.go | 4 +-- lib/osutil/osutil.go | 8 ++--- lib/osutil/osutil_test.go | 52 ++++++++++++++--------------- lib/osutil/traversessymlink_test.go | 6 ++-- lib/protocol/benchmark_test.go | 4 +-- lib/protocol/deviceid.go | 2 +- lib/protocol/protocol_test.go | 8 ++--- lib/rand/random.go | 2 +- lib/rc/rc.go | 2 +- lib/relay/client/methods.go | 6 ++-- lib/scanner/blocks.go | 2 +- lib/scanner/blocks_test.go | 10 +++--- lib/scanner/walk.go | 6 ++-- lib/scanner/walk_test.go | 10 +++--- lib/sha256/sha256.go | 6 ++-- lib/tlsutil/tlsutil.go | 6 ++-- lib/upgrade/upgrade_supported.go | 2 +- lib/versioner/simple.go | 4 +-- lib/versioner/staggered.go | 4 +-- lib/versioner/staggered_test.go | 2 +- lib/versioner/trashcan.go | 6 ++-- lib/versioner/trashcan_test.go | 2 +- lib/weakhash/benchmark_test.go | 16 ++++----- test/util.go | 2 +- 70 files changed, 252 insertions(+), 252 deletions(-) diff --git a/cmd/stgenfiles/main.go b/cmd/stgenfiles/main.go index ebe87d7f6..c5d522f77 100644 --- a/cmd/stgenfiles/main.go +++ b/cmd/stgenfiles/main.go @@ -82,7 +82,7 @@ func generateOneFile(fd io.ReadSeeker, p1 string, s int64) error { return err } - _ = os.Chmod(p1, os.FileMode(rand.Intn(0777)|0400)) + os.Chmod(p1, os.FileMode(rand.Intn(0777)|0400)) t := time.Now().Add(-time.Duration(rand.Intn(30*86400)) * time.Second) return os.Chtimes(p1, t, t) diff --git a/cmd/syncthing/auditservice.go b/cmd/syncthing/auditservice.go index afda087e0..c448e92ba 100644 --- a/cmd/syncthing/auditservice.go +++ b/cmd/syncthing/auditservice.go @@ -44,7 +44,7 @@ func (s *auditService) Serve() { for { select { case ev := <-sub.C(): - _ = enc.Encode(ev) + enc.Encode(ev) case <-s.stop: return } diff --git a/cmd/syncthing/cpuusage_unix.go b/cmd/syncthing/cpuusage_unix.go index 14ef026a3..fab828544 100644 --- a/cmd/syncthing/cpuusage_unix.go +++ b/cmd/syncthing/cpuusage_unix.go @@ -13,6 +13,6 @@ import "time" func cpuUsage() time.Duration { var rusage syscall.Rusage - _ = syscall.Getrusage(syscall.RUSAGE_SELF, &rusage) + syscall.Getrusage(syscall.RUSAGE_SELF, &rusage) return time.Duration(rusage.Utime.Nano() + rusage.Stime.Nano()) } diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go index 0b3ffe118..96832b1e1 100644 --- a/cmd/syncthing/gui.go +++ b/cmd/syncthing/gui.go @@ -965,7 +965,7 @@ func (s *apiService) postSystemShutdown(w http.ResponseWriter, r *http.Request) } func (s *apiService) flushResponse(resp string, w http.ResponseWriter) { - _, _ = w.Write([]byte(resp + "\n")) + w.Write([]byte(resp + "\n")) f := w.(http.Flusher) f.Flush() } @@ -1152,7 +1152,7 @@ func (s *apiService) getSupportBundle(w http.ResponseWriter, r *http.Request) { // Serve the buffer zip to client for download w.Header().Set("Content-Type", "application/zip") w.Header().Set("Content-Disposition", "attachment; filename="+zipFileName) - _, _ = io.Copy(w, &zipFilesBuffer) + io.Copy(w, &zipFilesBuffer) } func (s *apiService) getSystemHTTPMetrics(w http.ResponseWriter, r *http.Request) { @@ -1172,7 +1172,7 @@ func (s *apiService) getSystemHTTPMetrics(w http.ResponseWriter, r *http.Request } }) bs, _ := json.MarshalIndent(stats, "", " ") - _, _ = w.Write(bs) + w.Write(bs) } func (s *apiService) getSystemDiscovery(w http.ResponseWriter, r *http.Request) { @@ -1464,7 +1464,7 @@ func (s *apiService) getQR(w http.ResponseWriter, r *http.Request) { } w.Header().Set("Content-Type", "image/png") - _, _ = w.Write(code.PNG()) + w.Write(code.PNG()) } func (s *apiService) getPeerCompletion(w http.ResponseWriter, r *http.Request) { @@ -1562,7 +1562,7 @@ func (s *apiService) getSystemBrowse(w http.ResponseWriter, r *http.Request) { // Default value or in case of error unmarshalling ends up being basic fs. var fsType fs.FilesystemType - _ = fsType.UnmarshalText([]byte(qs.Get("filesystem"))) + fsType.UnmarshalText([]byte(qs.Get("filesystem"))) sendJSON(w, browseFiles(current, fsType)) } @@ -1659,7 +1659,7 @@ func (s *apiService) getHeapProf(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Disposition", "attachment; filename="+filename) runtime.GC() - _ = pprof.WriteHeapProfile(w) + pprof.WriteHeapProfile(w) } func toJsonFileInfoSlice(fs []db.FileInfoTruncated) []jsonDBFileInfo { diff --git a/cmd/syncthing/gui_statics.go b/cmd/syncthing/gui_statics.go index 0a1939e12..1b788ba61 100644 --- a/cmd/syncthing/gui_statics.go +++ b/cmd/syncthing/gui_statics.go @@ -160,7 +160,7 @@ func (s *staticsServer) serveAsset(w http.ResponseWriter, r *http.Request) { } w.Header().Set("Content-Length", fmt.Sprintf("%d", len(bs))) - _, _ = w.Write(bs) + w.Write(bs) } func (s *staticsServer) serveThemes(w http.ResponseWriter, r *http.Request) { diff --git a/cmd/syncthing/gui_test.go b/cmd/syncthing/gui_test.go index 005314d85..0904412dd 100644 --- a/cmd/syncthing/gui_test.go +++ b/cmd/syncthing/gui_test.go @@ -114,13 +114,13 @@ func TestAssetsDir(t *testing.T) { // The asset map contains compressed assets, so create a couple of gzip compressed assets here. buf := new(bytes.Buffer) gw := gzip.NewWriter(buf) - _, _ = gw.Write([]byte("default")) + gw.Write([]byte("default")) gw.Close() def := buf.Bytes() buf = new(bytes.Buffer) gw = gzip.NewWriter(buf) - _, _ = gw.Write([]byte("foo")) + gw.Write([]byte("foo")) gw.Close() foo := buf.Bytes() diff --git a/cmd/syncthing/heapprof.go b/cmd/syncthing/heapprof.go index 78583eeee..049d7dab7 100644 --- a/cmd/syncthing/heapprof.go +++ b/cmd/syncthing/heapprof.go @@ -49,7 +49,7 @@ func saveHeapProfiles(rate int) { panic(err) } - _ = os.Remove(name) // Error deliberately ignored + os.Remove(name) // Error deliberately ignored err = os.Rename(name+".tmp", name) if err != nil { panic(err) diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index ed3c0929d..499bb6fac 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -634,7 +634,7 @@ func syncthingMain(runtimeOptions RuntimeOptions) { // Attempt to increase the limit on number of open files to the maximum // allowed, in case we have many peers. We don't really care enough to // report the error if there is one. - _, _ = osutil.MaximizeOpenFileLimit() + osutil.MaximizeOpenFileLimit() // Ensure that we have a certificate and key. cert, err := tls.LoadX509KeyPair(locations[locCertFile], locations[locKeyFile]) @@ -757,7 +757,7 @@ func syncthingMain(runtimeOptions RuntimeOptions) { // Add and start folders for _, folderCfg := range cfg.Folders() { if folderCfg.Paused { - _ = folderCfg.CreateRoot() + folderCfg.CreateRoot() continue } m.AddFolder(folderCfg) @@ -847,8 +847,8 @@ func syncthingMain(runtimeOptions RuntimeOptions) { l.Infoln("Anonymous usage reporting is always enabled for candidate releases.") if opts.URAccepted != usageReportVersion { opts.URAccepted = usageReportVersion - _, _ = cfg.SetOptions(opts) - _ = cfg.Save() + cfg.SetOptions(opts) + cfg.Save() // Unique ID will be set and config saved below if necessary. } } @@ -856,8 +856,8 @@ func syncthingMain(runtimeOptions RuntimeOptions) { // If we are going to do usage reporting, ensure we have a valid unique ID. if opts := cfg.Options(); opts.URAccepted > 0 && opts.URUniqueID == "" { opts.URUniqueID = rand.String(8) - _, _ = cfg.SetOptions(opts) - _ = cfg.Save() + cfg.SetOptions(opts) + cfg.Save() } usageReportingSvc := newUsageReportingService(cfg, m, connectionsService) @@ -877,8 +877,8 @@ func syncthingMain(runtimeOptions RuntimeOptions) { opts.AutoUpgradeIntervalH = 12 // Set the option into the config as well, as the auto upgrade // loop expects to read a valid interval from there. - _, _ = cfg.SetOptions(opts) - _ = cfg.Save() + cfg.SetOptions(opts) + cfg.Save() } // We don't tweak the user's choice of upgrading to pre-releases or // not, as otherwise they cannot step off the candidate channel. @@ -959,7 +959,7 @@ func loadConfigAtStartup() *config.Wrapper { cfg, err := config.Load(cfgFile, myID) if os.IsNotExist(err) { cfg = defaultConfig(cfgFile) - _ = cfg.Save() + cfg.Save() l.Infof("Default config saved. Edit %s to taste or use the GUI\n", cfg.ConfigPath()) } else if err == io.EOF { l.Fatalln("Failed to load config: unexpected end of file. Truncated or empty configuration?") diff --git a/cmd/syncthing/mocked_config_test.go b/cmd/syncthing/mocked_config_test.go index c005d8a00..bf97087b4 100644 --- a/cmd/syncthing/mocked_config_test.go +++ b/cmd/syncthing/mocked_config_test.go @@ -30,7 +30,7 @@ func (c *mockedConfig) LDAP() config.LDAPConfiguration { func (c *mockedConfig) RawCopy() config.Configuration { cfg := config.Configuration{} - _ = util.SetDefaults(&cfg.Options) + util.SetDefaults(&cfg.Options) return cfg } diff --git a/cmd/syncthing/monitor.go b/cmd/syncthing/monitor.go index a80250372..d57811a1f 100644 --- a/cmd/syncthing/monitor.go +++ b/cmd/syncthing/monitor.go @@ -127,13 +127,13 @@ func monitorMain(runtimeOptions RuntimeOptions) { select { case s := <-stopSign: l.Infof("Signal %d received; exiting", s) - _ = cmd.Process.Signal(sigTerm) + cmd.Process.Signal(sigTerm) <-exit return case s := <-restartSign: l.Infof("Signal %d received; restarting", s) - _ = cmd.Process.Signal(sigHup) + cmd.Process.Signal(sigHup) err = <-exit case err = <-exit: @@ -179,7 +179,7 @@ func copyStderr(stderr io.Reader, dst io.Writer) { } if panicFd == nil { - _, _ = dst.Write([]byte(line)) + dst.Write([]byte(line)) if strings.Contains(line, "SIGILL") { l.Warnln(` @@ -226,20 +226,20 @@ func copyStderr(stderr io.Reader, dst io.Writer) { stdoutMut.Lock() for _, line := range stdoutFirstLines { - _, _ = panicFd.WriteString(line) + panicFd.WriteString(line) } - _, _ = panicFd.WriteString("...\n") + panicFd.WriteString("...\n") for _, line := range stdoutLastLines { - _, _ = panicFd.WriteString(line) + panicFd.WriteString(line) } stdoutMut.Unlock() } - _, _ = panicFd.WriteString("Panic at " + time.Now().Format(time.RFC3339) + "\n") + panicFd.WriteString("Panic at " + time.Now().Format(time.RFC3339) + "\n") } if panicFd != nil { - _, _ = panicFd.WriteString(line) + panicFd.WriteString(line) } } } @@ -263,7 +263,7 @@ func copyStdout(stdout io.Reader, dst io.Writer) { } stdoutMut.Unlock() - _, _ = dst.Write([]byte(line)) + dst.Write([]byte(line)) } } diff --git a/cmd/syncthing/monitor_test.go b/cmd/syncthing/monitor_test.go index 0f9abc4a6..b6c9c4a66 100644 --- a/cmd/syncthing/monitor_test.go +++ b/cmd/syncthing/monitor_test.go @@ -17,7 +17,7 @@ import ( func TestAutoClosedFile(t *testing.T) { os.RemoveAll("_autoclose") defer os.RemoveAll("_autoclose") - _ = os.Mkdir("_autoclose", 0755) + os.Mkdir("_autoclose", 0755) file := filepath.FromSlash("_autoclose/tmp") data := []byte("hello, world\n") diff --git a/cmd/syncthing/usage.go b/cmd/syncthing/usage.go index 005b98e44..1284ed2d4 100644 --- a/cmd/syncthing/usage.go +++ b/cmd/syncthing/usage.go @@ -19,11 +19,11 @@ func optionTable(w io.Writer, rows [][]string) { for _, row := range rows { for i, cell := range row { if i > 0 { - _, _ = tw.Write([]byte("\t")) + tw.Write([]byte("\t")) } - _, _ = tw.Write([]byte(cell)) + tw.Write([]byte(cell)) } - _, _ = tw.Write([]byte("\n")) + tw.Write([]byte("\n")) } tw.Flush() } diff --git a/cmd/syncthing/usage_report.go b/cmd/syncthing/usage_report.go index be7ca2eed..0f145a4bc 100644 --- a/cmd/syncthing/usage_report.go +++ b/cmd/syncthing/usage_report.go @@ -427,7 +427,7 @@ func (*usageReportingService) String() string { func cpuBench(iterations int, duration time.Duration, useWeakHash bool) float64 { dataSize := 16 * protocol.MinBlockSize bs := make([]byte, dataSize) - _, _ = rand.Reader.Read(bs) + rand.Reader.Read(bs) var perf float64 for i := 0; i < iterations; i++ { diff --git a/lib/beacon/broadcast.go b/lib/beacon/broadcast.go index 1b85cb9f9..d41e9ad10 100644 --- a/lib/beacon/broadcast.go +++ b/lib/beacon/broadcast.go @@ -126,9 +126,9 @@ func (w *broadcastWriter) Serve() { for _, ip := range dsts { dst := &net.UDPAddr{IP: ip, Port: w.port} - _ = conn.SetWriteDeadline(time.Now().Add(time.Second)) + conn.SetWriteDeadline(time.Now().Add(time.Second)) _, err := conn.WriteTo(bs, dst) - _ = conn.SetWriteDeadline(time.Time{}) + conn.SetWriteDeadline(time.Time{}) if err, ok := err.(net.Error); ok && err.Timeout() { // Write timeouts should not happen. We treat it as a fatal diff --git a/lib/beacon/multicast.go b/lib/beacon/multicast.go index 31d59db52..0bc91a7ea 100644 --- a/lib/beacon/multicast.go +++ b/lib/beacon/multicast.go @@ -117,9 +117,9 @@ func (w *multicastWriter) Serve() { success := 0 for _, intf := range intfs { wcm.IfIndex = intf.Index - _ = pconn.SetWriteDeadline(time.Now().Add(time.Second)) + pconn.SetWriteDeadline(time.Now().Add(time.Second)) _, err = pconn.WriteTo(bs, wcm, gaddr) - _ = pconn.SetWriteDeadline(time.Time{}) + pconn.SetWriteDeadline(time.Time{}) if err != nil { l.Debugln(err, "on write to", gaddr, intf.Name) diff --git a/lib/config/config.go b/lib/config/config.go index 465161b28..0b2186dd4 100644 --- a/lib/config/config.go +++ b/lib/config/config.go @@ -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 diff --git a/lib/config/config_test.go b/lib/config/config_test.go index c63fd1a3e..e845c28ca 100644 --- a/lib/config/config_test.go +++ b/lib/config/config_test.go @@ -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 { diff --git a/lib/config/folderconfiguration.go b/lib/config/folderconfiguration.go index 03c2ec1b9..92c79cda3 100644 --- a/lib/config/folderconfiguration.go +++ b/lib/config/folderconfiguration.go @@ -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 } diff --git a/lib/config/wrapper.go b/lib/config/wrapper.go index 84ff28b30..543464afb 100644 --- a/lib/config/wrapper.go +++ b/lib/config/wrapper.go @@ -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() diff --git a/lib/connections/limiter.go b/lib/connections/limiter.go index 849389e58..8dc17d5f9 100644 --- a/lib/connections/limiter.go +++ b/lib/connections/limiter.go @@ -257,17 +257,17 @@ func take(waiter waiter, tokens int) { if tokens < limiterBurstSize { // This is the by far more common case so we get it out of the way // early. - _ = waiter.WaitN(context.TODO(), tokens) + waiter.WaitN(context.TODO(), tokens) return } for tokens > 0 { // Consume limiterBurstSize tokens at a time until we're done. if tokens > limiterBurstSize { - _ = waiter.WaitN(context.TODO(), limiterBurstSize) + waiter.WaitN(context.TODO(), limiterBurstSize) tokens -= limiterBurstSize } else { - _ = waiter.WaitN(context.TODO(), tokens) + waiter.WaitN(context.TODO(), tokens) tokens = 0 } } diff --git a/lib/connections/service.go b/lib/connections/service.go index 9c192ca21..90874596d 100644 --- a/lib/connections/service.go +++ b/lib/connections/service.go @@ -190,7 +190,7 @@ next: continue } - _ = c.SetDeadline(time.Now().Add(20 * time.Second)) + c.SetDeadline(time.Now().Add(20 * time.Second)) hello, err := protocol.ExchangeHello(c, s.model.GetHello(remoteID)) if err != nil { if protocol.IsVersionMismatch(err) { @@ -214,7 +214,7 @@ next: c.Close() continue } - _ = c.SetDeadline(time.Time{}) + c.SetDeadline(time.Time{}) // The Model will return an error for devices that we don't want to // have a connection with for whatever reason, for example unknown devices. @@ -569,7 +569,7 @@ func (s *Service) CommitConfiguration(from, to config.Configuration) bool { for addr, listener := range s.listeners { if _, ok := seen[addr]; !ok || listener.Factory().Valid(to) != nil { l.Debugln("Stopping listener", addr) - _ = s.listenerSupervisor.Remove(s.listenerTokens[addr]) + s.listenerSupervisor.Remove(s.listenerTokens[addr]) delete(s.listenerTokens, addr) delete(s.listeners, addr) } @@ -582,7 +582,7 @@ func (s *Service) CommitConfiguration(from, to config.Configuration) bool { s.natServiceToken = &token } else if !to.Options.NATEnabled && s.natServiceToken != nil { l.Debugln("Stopping NAT service") - _ = s.Remove(*s.natServiceToken) + s.Remove(*s.natServiceToken) s.natServiceToken = nil } @@ -717,8 +717,8 @@ func warningFor(dev protocol.DeviceID, msg string) { } func tlsTimedHandshake(tc *tls.Conn) error { - _ = tc.SetDeadline(time.Now().Add(tlsHandshakeTimeout)) - defer func() { _ = tc.SetDeadline(time.Time{}) }() + tc.SetDeadline(time.Now().Add(tlsHandshakeTimeout)) + defer tc.SetDeadline(time.Time{}) return tc.Handshake() } diff --git a/lib/connections/structs.go b/lib/connections/structs.go index cf8e3bf29..b6ed39829 100644 --- a/lib/connections/structs.go +++ b/lib/connections/structs.go @@ -89,8 +89,8 @@ func (c internalConn) Close() { // *tls.Conn.Close() does more than it says on the tin. Specifically, it // sends a TLS alert message, which might block forever if the // connection is dead and we don't have a deadline set. - _ = c.SetWriteDeadline(time.Now().Add(250 * time.Millisecond)) - _ = c.Conn.Close() + c.SetWriteDeadline(time.Now().Add(250 * time.Millisecond)) + c.Conn.Close() } func (c internalConn) Type() string { diff --git a/lib/connections/tcp_listen.go b/lib/connections/tcp_listen.go index fd02d310e..5bd6661a2 100644 --- a/lib/connections/tcp_listen.go +++ b/lib/connections/tcp_listen.go @@ -83,7 +83,7 @@ func (t *tcpListener) Serve() { const maxAcceptFailures = 10 for { - _ = listener.SetDeadline(time.Now().Add(time.Second)) + listener.SetDeadline(time.Now().Add(time.Second)) conn, err := listener.Accept() select { case <-t.stop: diff --git a/lib/db/db_test.go b/lib/db/db_test.go index cf0038dbc..8c6942f67 100644 --- a/lib/db/db_test.go +++ b/lib/db/db_test.go @@ -19,7 +19,7 @@ func TestIgnoredFiles(t *testing.T) { t.Fatal(err) } db := NewLowlevel(ldb, "") - _ = UpdateSchema(db) + UpdateSchema(db) fs := NewFileSet("test", fs.NewFilesystem(fs.FilesystemTypeBasic, "."), db) @@ -204,7 +204,7 @@ func TestUpdate0to3(t *testing.T) { func TestDowngrade(t *testing.T) { db := OpenMemory() - _ = UpdateSchema(db) // sets the min version etc + UpdateSchema(db) // sets the min version etc // Bump the database version to something newer than we actually support miscDB := NewMiscDataNamespace(db) diff --git a/lib/db/namespaced.go b/lib/db/namespaced.go index cf44a9500..fd6432726 100644 --- a/lib/db/namespaced.go +++ b/lib/db/namespaced.go @@ -61,7 +61,7 @@ func (n *NamespacedKV) Reset() { func (n *NamespacedKV) PutInt64(key string, val int64) { var valBs [8]byte binary.BigEndian.PutUint64(valBs[:], uint64(val)) - _ = n.db.Put(n.prefixedKey(key), valBs[:], nil) + n.db.Put(n.prefixedKey(key), valBs[:], nil) } // Int64 returns the stored value interpreted as an int64 and a boolean that @@ -79,7 +79,7 @@ func (n *NamespacedKV) Int64(key string) (int64, bool) { // type) is overwritten. func (n *NamespacedKV) PutTime(key string, val time.Time) { valBs, _ := val.MarshalBinary() // never returns an error - _ = n.db.Put(n.prefixedKey(key), valBs, nil) + n.db.Put(n.prefixedKey(key), valBs, nil) } // Time returns the stored value interpreted as a time.Time and a boolean @@ -97,7 +97,7 @@ func (n NamespacedKV) Time(key string) (time.Time, bool) { // PutString stores a new string. Any existing value (even if of another type) // is overwritten. func (n *NamespacedKV) PutString(key, val string) { - _ = n.db.Put(n.prefixedKey(key), []byte(val), nil) + n.db.Put(n.prefixedKey(key), []byte(val), nil) } // String returns the stored value interpreted as a string and a boolean that @@ -113,7 +113,7 @@ func (n NamespacedKV) String(key string) (string, bool) { // PutBytes stores a new byte slice. Any existing value (even if of another type) // is overwritten. func (n *NamespacedKV) PutBytes(key string, val []byte) { - _ = n.db.Put(n.prefixedKey(key), val, nil) + n.db.Put(n.prefixedKey(key), val, nil) } // Bytes returns the stored value as a raw byte slice and a boolean that @@ -130,9 +130,9 @@ func (n NamespacedKV) Bytes(key string) ([]byte, bool) { // is overwritten. func (n *NamespacedKV) PutBool(key string, val bool) { if val { - _ = n.db.Put(n.prefixedKey(key), []byte{0x0}, nil) + n.db.Put(n.prefixedKey(key), []byte{0x0}, nil) } else { - _ = n.db.Put(n.prefixedKey(key), []byte{0x1}, nil) + n.db.Put(n.prefixedKey(key), []byte{0x1}, nil) } } @@ -149,7 +149,7 @@ func (n NamespacedKV) Bool(key string) (bool, bool) { // Delete deletes the specified key. It is allowed to delete a nonexistent // key. func (n NamespacedKV) Delete(key string) { - _ = n.db.Delete(n.prefixedKey(key), nil) + n.db.Delete(n.prefixedKey(key), nil) } func (n NamespacedKV) prefixedKey(key string) []byte { diff --git a/lib/db/set.go b/lib/db/set.go index 06055fb35..cdd409d5b 100644 --- a/lib/db/set.go +++ b/lib/db/set.go @@ -101,7 +101,7 @@ func (s *FileSet) recalcCounts() { }) s.meta.SetCreated() - _ = s.meta.toDB(s.db, []byte(s.folder)) + s.meta.toDB(s.db, []byte(s.folder)) } func (s *FileSet) Drop(device protocol.DeviceID) { @@ -127,7 +127,7 @@ func (s *FileSet) Drop(device protocol.DeviceID) { s.meta.resetAll(device) } - _ = s.meta.toDB(s.db, []byte(s.folder)) + s.meta.toDB(s.db, []byte(s.folder)) } func (s *FileSet) Update(device protocol.DeviceID, fs []protocol.FileInfo) { @@ -141,7 +141,7 @@ func (s *FileSet) Update(device protocol.DeviceID, fs []protocol.FileInfo) { s.updateMutex.Lock() defer s.updateMutex.Unlock() - defer func() { _ = s.meta.toDB(s.db, []byte(s.folder)) }() + defer s.meta.toDB(s.db, []byte(s.folder)) if device == protocol.LocalDeviceID { // For the local device we have a bunch of metadata to track. @@ -295,7 +295,7 @@ func DropDeltaIndexIDs(db *Lowlevel) { dbi := db.NewIterator(util.BytesPrefix([]byte{KeyTypeIndexID}), nil) defer dbi.Release() for dbi.Next() { - _ = db.Delete(dbi.Key(), nil) + db.Delete(dbi.Key(), nil) } } diff --git a/lib/db/smallindex.go b/lib/db/smallindex.go index 3a9591e0e..9ef00f5fd 100644 --- a/lib/db/smallindex.go +++ b/lib/db/smallindex.go @@ -82,7 +82,7 @@ func (i *smallIndex) ID(val []byte) uint32 { key := make([]byte, len(i.prefix)+8) // prefix plus uint32 id copy(key, i.prefix) binary.BigEndian.PutUint32(key[len(i.prefix):], id) - _ = i.db.Put(key, val, nil) + i.db.Put(key, val, nil) i.mut.Unlock() return id @@ -115,7 +115,7 @@ func (i *smallIndex) Delete(val []byte) { // Put an empty value into the database. This indicates that the // entry does not exist any more and prevents the ID from being // reused in the future. - _ = i.db.Put(key, []byte{}, nil) + i.db.Put(key, []byte{}, nil) // Delete reverse mapping. delete(i.id2val, id) diff --git a/lib/db/transactions.go b/lib/db/transactions.go index 65026eb2f..2cd38bd5c 100644 --- a/lib/db/transactions.go +++ b/lib/db/transactions.go @@ -127,7 +127,7 @@ func (t readWriteTransaction) updateGlobal(gk, keyBuf, folder, device []byte, fi var fl VersionList if svl, err := t.Get(gk, nil); err == nil { - _ = fl.Unmarshal(svl) // Ignore error, continue with empty fl + fl.Unmarshal(svl) // Ignore error, continue with empty fl } fl, removedFV, removedAt, insertedAt := fl.update(folder, device, file, t.readOnlyTransaction) if insertedAt == -1 { diff --git a/lib/db/util_test.go b/lib/db/util_test.go index 7661c50f6..aa5595e91 100644 --- a/lib/db/util_test.go +++ b/lib/db/util_test.go @@ -23,7 +23,7 @@ func writeJSONS(w io.Writer, db *leveldb.DB) { defer it.Release() enc := json.NewEncoder(w) for it.Next() { - _ = enc.Encode(map[string][]byte{ + enc.Encode(map[string][]byte{ "k": it.Key(), "v": it.Value(), }) @@ -54,7 +54,7 @@ func openJSONS(file string) (*leveldb.DB, error) { return nil, err } - _ = db.Put(row["k"], row["v"], nil) + db.Put(row["k"], row["v"], nil) } return db, nil diff --git a/lib/dialer/internal.go b/lib/dialer/internal.go index d03126b75..252ad921e 100644 --- a/lib/dialer/internal.go +++ b/lib/dialer/internal.go @@ -62,7 +62,7 @@ func dialWithFallback(proxyDialFunc dialFunc, fallbackDialFunc dialFunc, network conn, err := proxyDialFunc(network, addr) if err == nil { l.Debugf("Dialing %s address %s via proxy - success, %s -> %s", network, addr, conn.LocalAddr(), conn.RemoteAddr()) - _ = SetTCPOptions(conn) + SetTCPOptions(conn) return dialerConn{ conn, newDialerAddr(network, addr), }, nil @@ -76,7 +76,7 @@ func dialWithFallback(proxyDialFunc dialFunc, fallbackDialFunc dialFunc, network conn, err = fallbackDialFunc(network, addr) if err == nil { l.Debugf("Dialing %s address %s via fallback - success, %s -> %s", network, addr, conn.LocalAddr(), conn.RemoteAddr()) - _ = SetTCPOptions(conn) + SetTCPOptions(conn) } else { l.Debugf("Dialing %s address %s via fallback - error %s", network, addr, err) } diff --git a/lib/discover/cache_test.go b/lib/discover/cache_test.go index ce7cbcb7d..69d85eebe 100644 --- a/lib/discover/cache_test.go +++ b/lib/discover/cache_test.go @@ -96,7 +96,7 @@ func TestCacheSlowLookup(t *testing.T) { // Start a lookup, which will take at least a second t0 := time.Now() - go func() { _, _ = c.Lookup(protocol.LocalDeviceID) }() + go c.Lookup(protocol.LocalDeviceID) <-started // The slow lookup method has been called so we're inside the lock // It should be possible to get ChildErrors while it's running diff --git a/lib/discover/global_test.go b/lib/discover/global_test.go index 6ebc681d2..0bc1e63b9 100644 --- a/lib/discover/global_test.go +++ b/lib/discover/global_test.go @@ -242,7 +242,7 @@ func (s *fakeDiscoveryServer) handler(w http.ResponseWriter, r *http.Request) { w.WriteHeader(204) } else { w.Header().Set("Content-Type", "application/json") - _, _ = w.Write([]byte(`{"addresses":["tcp://192.0.2.42::22000"], "relays":[{"url": "relay://192.0.2.43:443", "latency": 42}]}`)) + w.Write([]byte(`{"addresses":["tcp://192.0.2.42::22000"], "relays":[{"url": "relay://192.0.2.43:443", "latency": 42}]}`)) } } diff --git a/lib/events/events_test.go b/lib/events/events_test.go index 33804490b..3848e973c 100644 --- a/lib/events/events_test.go +++ b/lib/events/events_test.go @@ -164,7 +164,7 @@ func TestGlobalIDs(t *testing.T) { s := l.Subscribe(AllEvents) defer l.Unsubscribe(s) l.Log(DeviceConnected, "foo") - _ = l.Subscribe(AllEvents) + l.Subscribe(AllEvents) l.Log(DeviceConnected, "bar") ev, err := s.Poll(timeout) diff --git a/lib/fs/basicfs_test.go b/lib/fs/basicfs_test.go index 88e9ce826..dd91aac76 100644 --- a/lib/fs/basicfs_test.go +++ b/lib/fs/basicfs_test.go @@ -33,7 +33,7 @@ func TestChmodFile(t *testing.T) { path := filepath.Join(dir, "file") defer os.RemoveAll(dir) - defer func() { _ = os.Chmod(path, 0666) }() + defer os.Chmod(path, 0666) fd, err := os.Create(path) if err != nil { @@ -74,7 +74,7 @@ func TestChownFile(t *testing.T) { path := filepath.Join(dir, "file") defer os.RemoveAll(dir) - defer func() { _ = os.Chmod(path, 0666) }() + defer os.Chmod(path, 0666) fd, err := os.Create(path) if err != nil { @@ -116,7 +116,7 @@ func TestChmodDir(t *testing.T) { mode = os.FileMode(0777) } - defer func() { _ = os.Chmod(path, mode) }() + defer os.Chmod(path, mode) if err := os.Mkdir(path, mode); err != nil { t.Error(err) @@ -147,7 +147,7 @@ func TestChtimes(t *testing.T) { mtime := time.Now().Add(-time.Hour) - _ = fs.Chtimes("file", mtime, mtime) + fs.Chtimes("file", mtime, mtime) stat, err := os.Stat(path) if err != nil { diff --git a/lib/fs/basicfs_watch_test.go b/lib/fs/basicfs_watch_test.go index 23a963492..40bb40190 100644 --- a/lib/fs/basicfs_watch_test.go +++ b/lib/fs/basicfs_watch_test.go @@ -98,7 +98,7 @@ func TestWatchInclude(t *testing.T) { file := "file" ignored := "ignored" - _ = testFs.MkdirAll(filepath.Join(name, ignored), 0777) + testFs.MkdirAll(filepath.Join(name, ignored), 0777) included := filepath.Join(ignored, "included") testCase := func() { @@ -274,7 +274,7 @@ func TestWatchSymlinkedRoot(t *testing.T) { if err := testFs.MkdirAll(name, 0755); err != nil { panic(fmt.Sprintf("Failed to create directory %s: %s", name, err)) } - defer func() { _ = testFs.RemoveAll(name) }() + defer testFs.RemoveAll(name) root := filepath.Join(name, "root") if err := testFs.MkdirAll(root, 0777); err != nil { @@ -376,7 +376,7 @@ func testScenario(t *testing.T, name string, testCase func(), expectedEvents, al if err := testFs.MkdirAll(name, 0755); err != nil { panic(fmt.Sprintf("Failed to create directory %s: %s", name, err)) } - defer func() { _ = testFs.RemoveAll(name) }() + defer testFs.RemoveAll(name) ctx, cancel := context.WithCancel(context.Background()) defer cancel() diff --git a/lib/fs/fakefs.go b/lib/fs/fakefs.go index 986f9585b..dbfced694 100644 --- a/lib/fs/fakefs.go +++ b/lib/fs/fakefs.go @@ -105,22 +105,22 @@ func newFakeFilesystem(root string) *fakefs { for (files == 0 || createdFiles < files) && (maxsize == 0 || writtenData>>20 < int64(maxsize)) { dir := filepath.Join(fmt.Sprintf("%02x", rng.Intn(255)), fmt.Sprintf("%02x", rng.Intn(255))) file := fmt.Sprintf("%016x", rng.Int63()) - _ = fs.MkdirAll(dir, 0755) + fs.MkdirAll(dir, 0755) fd, _ := fs.Create(filepath.Join(dir, file)) createdFiles++ fsize := int64(sizeavg/2 + rng.Intn(sizeavg)) - _ = fd.Truncate(fsize) + fd.Truncate(fsize) writtenData += fsize ftime := time.Unix(1000000000+rng.Int63n(10*365*86400), 0) - _ = fs.Chtimes(filepath.Join(dir, file), ftime, ftime) + fs.Chtimes(filepath.Join(dir, file), ftime, ftime) } } // Also create a default folder marker for good measure - _ = fs.Mkdir(".stfolder", 0700) + fs.Mkdir(".stfolder", 0700) fakefsFs[root] = fs return fs @@ -583,7 +583,7 @@ func (f *fakeFile) readShortAt(p []byte, offs int64) (int, error) { // name. if f.seed == 0 { hf := fnv.New64() - _, _ = hf.Write([]byte(f.name)) + hf.Write([]byte(f.name)) f.seed = int64(hf.Sum64()) } @@ -601,7 +601,7 @@ func (f *fakeFile) readShortAt(p []byte, offs int64) (int, error) { diff := offs - minOffs if diff > 0 { lr := io.LimitReader(f.rng, diff) - _, _ = io.Copy(ioutil.Discard, lr) + io.Copy(ioutil.Discard, lr) } f.offset = offs diff --git a/lib/fs/fakefs_test.go b/lib/fs/fakefs_test.go index a42dc592e..6601554c2 100644 --- a/lib/fs/fakefs_test.go +++ b/lib/fs/fakefs_test.go @@ -130,10 +130,10 @@ func TestFakeFSRead(t *testing.T) { // Create fd, _ := fs.Create("test") - _ = fd.Truncate(3 * 1 << randomBlockShift) + fd.Truncate(3 * 1 << randomBlockShift) // Read - _, _ = fd.Seek(0, io.SeekStart) + fd.Seek(0, io.SeekStart) bs0, err := ioutil.ReadAll(fd) if err != nil { t.Fatal(err) @@ -143,7 +143,7 @@ func TestFakeFSRead(t *testing.T) { } // Read again, starting at an odd offset - _, _ = fd.Seek(0, io.SeekStart) + fd.Seek(0, io.SeekStart) buf0 := make([]byte, 12345) n, _ := fd.Read(buf0) if n != len(buf0) { diff --git a/lib/fs/mtimefs.go b/lib/fs/mtimefs.go index bf71bca13..3f375640e 100644 --- a/lib/fs/mtimefs.go +++ b/lib/fs/mtimefs.go @@ -53,7 +53,7 @@ func (f *MtimeFS) Chtimes(name string, atime, mtime time.Time) error { } // Do a normal Chtimes call, don't care if it succeeds or not. - _ = f.chtimes(name, atime, mtime) + f.chtimes(name, atime, mtime) // Stat the file to see what happened. Here we *do* return an error, // because it might be "does not exist" or similar. diff --git a/lib/fs/mtimefs_test.go b/lib/fs/mtimefs_test.go index a50cc5559..e8befb591 100644 --- a/lib/fs/mtimefs_test.go +++ b/lib/fs/mtimefs_test.go @@ -18,10 +18,10 @@ import ( func TestMtimeFS(t *testing.T) { os.RemoveAll("testdata") defer os.RemoveAll("testdata") - _ = os.Mkdir("testdata", 0755) - _ = ioutil.WriteFile("testdata/exists0", []byte("hello"), 0644) - _ = ioutil.WriteFile("testdata/exists1", []byte("hello"), 0644) - _ = ioutil.WriteFile("testdata/exists2", []byte("hello"), 0644) + os.Mkdir("testdata", 0755) + ioutil.WriteFile("testdata/exists0", []byte("hello"), 0644) + ioutil.WriteFile("testdata/exists1", []byte("hello"), 0644) + ioutil.WriteFile("testdata/exists2", []byte("hello"), 0644) // a random time with nanosecond precision testTime := time.Unix(1234567890, 123456789) @@ -73,7 +73,7 @@ func TestMtimeFS(t *testing.T) { // filesystems. testTime = time.Now().Add(5 * time.Hour).Truncate(time.Minute) - _ = os.Chtimes("testdata/exists0", testTime, testTime) + os.Chtimes("testdata/exists0", testTime, testTime) if info, err := mtimefs.Lstat("testdata/exists0"); err != nil { t.Error("Lstat shouldn't fail:", err) } else if !info.ModTime().Equal(testTime) { @@ -93,8 +93,8 @@ func TestMtimeFSInsensitive(t *testing.T) { theTest := func(t *testing.T, fs *MtimeFS, shouldSucceed bool) { os.RemoveAll("testdata") defer os.RemoveAll("testdata") - _ = os.Mkdir("testdata", 0755) - _ = ioutil.WriteFile("testdata/FiLe", []byte("hello"), 0644) + os.Mkdir("testdata", 0755) + ioutil.WriteFile("testdata/FiLe", []byte("hello"), 0644) // a random time with nanosecond precision testTime := time.Unix(1234567890, 123456789) diff --git a/lib/fs/tempname.go b/lib/fs/tempname.go index 399f200e5..45ea8b8b9 100644 --- a/lib/fs/tempname.go +++ b/lib/fs/tempname.go @@ -51,7 +51,7 @@ func TempNameWithPrefix(name, prefix string) string { tbase := filepath.Base(name) if len(tbase) > maxFilenameLength { hash := md5.New() - _, _ = hash.Write([]byte(name)) + hash.Write([]byte(name)) tbase = fmt.Sprintf("%x", hash.Sum(nil)) } tname := fmt.Sprintf("%s%s.tmp", prefix, tbase) diff --git a/lib/ignore/ignore.go b/lib/ignore/ignore.go index 0b6ceefbb..74d35c1ed 100644 --- a/lib/ignore/ignore.go +++ b/lib/ignore/ignore.go @@ -136,7 +136,7 @@ func (m *Matcher) Load(file string) error { fd, info, err := loadIgnoreFile(m.fs, file, m.changeDetector) if err != nil { - _ = m.parseLocked(&bytes.Buffer{}, file) + m.parseLocked(&bytes.Buffer{}, file) return err } defer fd.Close() @@ -310,8 +310,8 @@ func (m *Matcher) SkipIgnoredDirs() bool { func hashPatterns(patterns []Pattern) string { h := md5.New() for _, pat := range patterns { - _, _ = h.Write([]byte(pat.String())) - _, _ = h.Write([]byte("\n")) + h.Write([]byte(pat.String())) + h.Write([]byte("\n")) } return fmt.Sprintf("%x", h.Sum(nil)) } @@ -505,7 +505,7 @@ func WriteIgnores(filesystem fs.Filesystem, path string, content []string) error if err := fd.Close(); err != nil { return err } - _ = filesystem.Hide(path) + filesystem.Hide(path) return nil } diff --git a/lib/ignore/ignore_test.go b/lib/ignore/ignore_test.go index e7254a90e..63d0bb5a0 100644 --- a/lib/ignore/ignore_test.go +++ b/lib/ignore/ignore_test.go @@ -247,15 +247,15 @@ func TestCaching(t *testing.T) { defer fd1.Close() defer fd2.Close() - defer func() { _ = fs.Remove(fd1.Name()) }() - defer func() { _ = fs.Remove(fd2.Name()) }() + defer fs.Remove(fd1.Name()) + defer fs.Remove(fd2.Name()) _, err = fd1.Write([]byte("/x/\n#include " + filepath.Base(fd2.Name()) + "\n")) if err != nil { t.Fatal(err) } - _, _ = fd2.Write([]byte("/y/\n")) + fd2.Write([]byte("/y/\n")) pats := New(fs, WithCache(true)) err = pats.Load(fd1.Name()) @@ -290,10 +290,10 @@ func TestCaching(t *testing.T) { // Modify the include file, expect empty cache. Ensure the timestamp on // the file changes. - _, _ = fd2.Write([]byte("/z/\n")) - _ = fd2.Sync() + fd2.Write([]byte("/z/\n")) + fd2.Sync() fakeTime := time.Now().Add(5 * time.Second) - _ = fs.Chtimes(fd2.Name(), fakeTime, fakeTime) + fs.Chtimes(fd2.Name(), fakeTime, fakeTime) err = pats.Load(fd1.Name()) if err != nil { @@ -322,10 +322,10 @@ func TestCaching(t *testing.T) { // Modify the root file, expect cache to be invalidated - _, _ = fd1.Write([]byte("/a/\n")) - _ = fd1.Sync() + fd1.Write([]byte("/a/\n")) + fd1.Sync() fakeTime = time.Now().Add(5 * time.Second) - _ = fs.Chtimes(fd1.Name(), fakeTime, fakeTime) + fs.Chtimes(fd1.Name(), fakeTime, fakeTime) err = pats.Load(fd1.Name()) if err != nil { @@ -435,7 +435,7 @@ flamingo _, err = fd.Write([]byte(stignore)) defer fd.Close() - defer func() { _ = fs.Remove(fd.Name()) }() + defer fs.Remove(fd.Name()) if err != nil { b.Fatal(err) } @@ -475,7 +475,7 @@ func TestCacheReload(t *testing.T) { } defer fd.Close() - defer func() { _ = fs.Remove(fd.Name()) }() + defer fs.Remove(fd.Name()) // Ignore file matches f1 and f2 @@ -516,9 +516,9 @@ func TestCacheReload(t *testing.T) { if err != nil { t.Fatal(err) } - _ = fd.Sync() + fd.Sync() fakeTime := time.Now().Add(5 * time.Second) - _ = fs.Chtimes(fd.Name(), fakeTime, fakeTime) + fs.Chtimes(fd.Name(), fakeTime, fakeTime) err = pats.Load(fd.Name()) if err != nil { @@ -606,7 +606,7 @@ func TestHashOfEmpty(t *testing.T) { // recalculate the hash. d41d8cd98f00b204e9800998ecf8427e is the md5 of // nothing. - _ = p1.Load("file/does/not/exist") + p1.Load("file/does/not/exist") secondHash := p1.Hash() if firstHash == secondHash { diff --git a/lib/logger/logger.go b/lib/logger/logger.go index f42887410..921eb0e65 100644 --- a/lib/logger/logger.go +++ b/lib/logger/logger.go @@ -120,7 +120,7 @@ func (l *logger) debugln(level int, vals ...interface{}) { s := fmt.Sprintln(vals...) l.mut.Lock() defer l.mut.Unlock() - _ = l.logger.Output(level, "DEBUG: "+s) + l.logger.Output(level, "DEBUG: "+s) l.callHandlers(LevelDebug, s) } @@ -132,7 +132,7 @@ func (l *logger) debugf(level int, format string, vals ...interface{}) { s := fmt.Sprintf(format, vals...) l.mut.Lock() defer l.mut.Unlock() - _ = l.logger.Output(level, "DEBUG: "+s) + l.logger.Output(level, "DEBUG: "+s) l.callHandlers(LevelDebug, s) } @@ -141,7 +141,7 @@ func (l *logger) Verboseln(vals ...interface{}) { s := fmt.Sprintln(vals...) l.mut.Lock() defer l.mut.Unlock() - _ = l.logger.Output(2, "VERBOSE: "+s) + l.logger.Output(2, "VERBOSE: "+s) l.callHandlers(LevelVerbose, s) } @@ -150,7 +150,7 @@ func (l *logger) Verbosef(format string, vals ...interface{}) { s := fmt.Sprintf(format, vals...) l.mut.Lock() defer l.mut.Unlock() - _ = l.logger.Output(2, "VERBOSE: "+s) + l.logger.Output(2, "VERBOSE: "+s) l.callHandlers(LevelVerbose, s) } @@ -159,7 +159,7 @@ func (l *logger) Infoln(vals ...interface{}) { s := fmt.Sprintln(vals...) l.mut.Lock() defer l.mut.Unlock() - _ = l.logger.Output(2, "INFO: "+s) + l.logger.Output(2, "INFO: "+s) l.callHandlers(LevelInfo, s) } @@ -168,7 +168,7 @@ func (l *logger) Infof(format string, vals ...interface{}) { s := fmt.Sprintf(format, vals...) l.mut.Lock() defer l.mut.Unlock() - _ = l.logger.Output(2, "INFO: "+s) + l.logger.Output(2, "INFO: "+s) l.callHandlers(LevelInfo, s) } @@ -177,7 +177,7 @@ func (l *logger) Warnln(vals ...interface{}) { s := fmt.Sprintln(vals...) l.mut.Lock() defer l.mut.Unlock() - _ = l.logger.Output(2, "WARNING: "+s) + l.logger.Output(2, "WARNING: "+s) l.callHandlers(LevelWarn, s) } @@ -186,7 +186,7 @@ func (l *logger) Warnf(format string, vals ...interface{}) { s := fmt.Sprintf(format, vals...) l.mut.Lock() defer l.mut.Unlock() - _ = l.logger.Output(2, "WARNING: "+s) + l.logger.Output(2, "WARNING: "+s) l.callHandlers(LevelWarn, s) } @@ -196,7 +196,7 @@ func (l *logger) Fatalln(vals ...interface{}) { s := fmt.Sprintln(vals...) l.mut.Lock() defer l.mut.Unlock() - _ = l.logger.Output(2, "FATAL: "+s) + l.logger.Output(2, "FATAL: "+s) l.callHandlers(LevelFatal, s) os.Exit(1) } @@ -207,7 +207,7 @@ func (l *logger) Fatalf(format string, vals ...interface{}) { s := fmt.Sprintf(format, vals...) l.mut.Lock() defer l.mut.Unlock() - _ = l.logger.Output(2, "FATAL: "+s) + l.logger.Output(2, "FATAL: "+s) l.callHandlers(LevelFatal, s) os.Exit(1) } diff --git a/lib/model/folder_sendrecv.go b/lib/model/folder_sendrecv.go index 59fe3d3b0..8950ec41e 100644 --- a/lib/model/folder_sendrecv.go +++ b/lib/model/folder_sendrecv.go @@ -1016,7 +1016,7 @@ func (f *sendReceiveFolder) handleFile(file protocol.FileInfo, copyChan chan<- c // Otherwise, discard the file ourselves in order for the // sharedpuller not to panic when it fails to exclusively create a // file which already exists - _ = osutil.InWritableDir(f.fs.Remove, f.fs, tempName) + osutil.InWritableDir(f.fs.Remove, f.fs, tempName) } } else { // Copy the blocks, as we don't want to shuffle them on the FileInfo @@ -1142,7 +1142,7 @@ func (f *sendReceiveFolder) shortcutFile(file, curFile protocol.FileInfo, dbUpda } } - _ = f.fs.Chtimes(file.Name, file.ModTime(), file.ModTime()) // never fails + f.fs.Chtimes(file.Name, file.ModTime(), file.ModTime()) // never fails // This may have been a conflict. We should merge the version vectors so // that our clock doesn't move backwards. @@ -1536,7 +1536,7 @@ func (f *sendReceiveFolder) performFinish(ignores *ignore.Matcher, file, curFile } // Set the correct timestamp on the new file - _ = f.fs.Chtimes(file.Name, file.ModTime(), file.ModTime()) // never fails + f.fs.Chtimes(file.Name, file.ModTime(), file.ModTime()) // never fails // Record the updated file in the index dbUpdateChan <- dbUpdateJob{file, dbUpdateHandleFile} @@ -1706,7 +1706,7 @@ func (f *sendReceiveFolder) pullScannerRoutine(scanChan <-chan string) { l.Debugln(f, "scheduling scan after pulling for", path) scanList = append(scanList, path) } - _ = f.Scan(scanList) + f.Scan(scanList) } } @@ -1858,7 +1858,7 @@ func (f *sendReceiveFolder) deleteDir(dir string, ignores *ignore.Matcher, scanC } for _, del := range toBeDeleted { - _ = f.fs.RemoveAll(del) + f.fs.RemoveAll(del) } err := osutil.InWritableDir(f.fs.Remove, f.fs, dir) diff --git a/lib/model/model.go b/lib/model/model.go index 78808e908..181b6abfc 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -258,9 +258,9 @@ func (m *Model) startFolderLocked(folder string) config.FolderType { ffs := fs.MtimeFS() // These are our metadata files, and they should always be hidden. - _ = ffs.Hide(config.DefaultMarkerName) - _ = ffs.Hide(".stversions") - _ = ffs.Hide(".stignore") + ffs.Hide(config.DefaultMarkerName) + ffs.Hide(".stversions") + ffs.Hide(".stignore") p := folderFactory(m, cfg, ver, ffs) @@ -338,7 +338,7 @@ func (m *Model) RemoveFolder(cfg config.FolderConfiguration) { m.fmut.Lock() m.pmut.Lock() // Delete syncthing specific files - _ = cfg.Filesystem().RemoveAll(config.DefaultMarkerName) + cfg.Filesystem().RemoveAll(config.DefaultMarkerName) m.tearDownFolderLocked(cfg, fmt.Errorf("removing folder %v", cfg.Description())) // Remove it from the database @@ -362,7 +362,7 @@ func (m *Model) tearDownFolderLocked(cfg config.FolderConfiguration, err error) m.pmut.Unlock() m.fmut.Unlock() for _, id := range tokens { - _ = m.RemoveAndWait(id, 0) + m.RemoveAndWait(id, 0) } m.fmut.Lock() m.pmut.Lock() @@ -1185,7 +1185,7 @@ func (m *Model) handleIntroductions(introducerCfg config.DeviceConfiguration, cm } if changed { - _, _ = m.cfg.SetFolder(fcfg) + m.cfg.SetFolder(fcfg) } } @@ -1242,7 +1242,7 @@ func (m *Model) handleDeintroductions(introducerCfg config.DeviceConfiguration, cfg := m.cfg.RawCopy() cfg.Folders = folders cfg.Devices = devices - _, _ = m.cfg.Replace(cfg) + m.cfg.Replace(cfg) } return changed @@ -1321,7 +1321,7 @@ func (m *Model) introduceDevice(device protocol.Device, introducerCfg config.Dev newDeviceCfg.SkipIntroductionRemovals = device.SkipIntroductionRemovals } - _, _ = m.cfg.SetDevice(newDeviceCfg) + m.cfg.SetDevice(newDeviceCfg) } // Closed is called when a connection has been closed @@ -1772,8 +1772,8 @@ func (m *Model) AddConnection(conn connections.Connection, hello protocol.HelloR if (device.Name == "" || m.cfg.Options().OverwriteRemoteDevNames) && hello.DeviceName != "" { device.Name = hello.DeviceName - _, _ = m.cfg.SetDevice(device) - _ = m.cfg.Save() + m.cfg.SetDevice(device) + m.cfg.Save() } m.deviceWasSeen(deviceID) @@ -1860,7 +1860,7 @@ func sendIndexes(conn protocol.Connection, folder string, fs *db.FileSet, ignore // local index may update for other folders than the one we are // sending for. if fs.Sequence(protocol.LocalDeviceID) <= prevSequence { - _, _ = sub.Poll(time.Minute) + sub.Poll(time.Minute) continue } @@ -2485,7 +2485,7 @@ func (m *Model) RestoreFolderVersions(folder string, versions map[string]time.Ti } } - _ = filesystem.MkdirAll(filepath.Dir(target), 0755) + filesystem.MkdirAll(filepath.Dir(target), 0755) if err == nil { err = osutil.Copy(filesystem, source, target) } diff --git a/lib/nat/service.go b/lib/nat/service.go index 59c32eef4..a0a480a90 100644 --- a/lib/nat/service.go +++ b/lib/nat/service.go @@ -328,6 +328,6 @@ findIP: func hash(input string) int64 { h := fnv.New64a() - _, _ = h.Write([]byte(input)) + h.Write([]byte(input)) return int64(h.Sum64()) } diff --git a/lib/osutil/atomic.go b/lib/osutil/atomic.go index eca4ea67a..9618b724c 100644 --- a/lib/osutil/atomic.go +++ b/lib/osutil/atomic.go @@ -81,7 +81,7 @@ func (w *AtomicWriter) Close() error { } // Try to not leave temp file around, but ignore error. - defer func() { _ = w.fs.Remove(w.next.Name()) }() + defer w.fs.Remove(w.next.Name()) if err := w.next.Sync(); err != nil { w.err = err @@ -110,7 +110,7 @@ func (w *AtomicWriter) Close() error { // fsync the directory too if fd, err := w.fs.Open(filepath.Dir(w.next.Name())); err == nil { - _ = fd.Sync() + fd.Sync() fd.Close() } diff --git a/lib/osutil/osutil.go b/lib/osutil/osutil.go index 478b238b8..256ca1dab 100644 --- a/lib/osutil/osutil.go +++ b/lib/osutil/osutil.go @@ -42,7 +42,7 @@ func TryRename(filesystem fs.Filesystem, from, to string) error { func Rename(filesystem fs.Filesystem, from, to string) error { // Don't leave a dangling temp file in case of rename error if !(runtime.GOOS == "windows" && strings.EqualFold(from, to)) { - defer func() { _ = filesystem.Remove(from) }() + defer filesystem.Remove(from) } return TryRename(filesystem, from, to) } @@ -94,13 +94,13 @@ func withPreparedTarget(filesystem fs.Filesystem, from, to string, f func() erro // Make sure the destination directory is writeable toDir := filepath.Dir(to) if info, err := filesystem.Stat(toDir); err == nil && info.IsDir() && info.Mode()&0200 == 0 { - _ = filesystem.Chmod(toDir, 0755) - defer func() { _ = filesystem.Chmod(toDir, info.Mode()) }() + filesystem.Chmod(toDir, 0755) + defer filesystem.Chmod(toDir, info.Mode()) } // On Windows, make sure the destination file is writeable (or we can't delete it) if runtime.GOOS == "windows" { - _ = filesystem.Chmod(to, 0666) + filesystem.Chmod(to, 0666) if !strings.EqualFold(from, to) { err := filesystem.Remove(to) if err != nil && !fs.IsNotExist(err) { diff --git a/lib/osutil/osutil_test.go b/lib/osutil/osutil_test.go index 80f8ce7b7..c6ee2d487 100644 --- a/lib/osutil/osutil_test.go +++ b/lib/osutil/osutil_test.go @@ -26,9 +26,9 @@ func TestInWriteableDir(t *testing.T) { fs := fs.NewFilesystem(fs.FilesystemTypeBasic, ".") - _ = os.Mkdir("testdata", 0700) - _ = os.Mkdir("testdata/rw", 0700) - _ = os.Mkdir("testdata/ro", 0500) + os.Mkdir("testdata", 0700) + os.Mkdir("testdata/rw", 0700) + os.Mkdir("testdata/ro", 0500) create := func(name string) error { fd, err := os.Create(name) @@ -87,7 +87,7 @@ func TestInWritableDirWindowsRemove(t *testing.T) { if err != nil { t.Fatal(err) } - defer func() { _ = os.Chmod("testdata/windows/ro/readonlynew", 0700) }() + defer os.Chmod("testdata/windows/ro/readonlynew", 0700) defer os.RemoveAll("testdata") create := func(name string) error { @@ -99,12 +99,12 @@ func TestInWritableDirWindowsRemove(t *testing.T) { return nil } - _ = os.Mkdir("testdata", 0700) + os.Mkdir("testdata", 0700) - _ = os.Mkdir("testdata/windows", 0500) - _ = os.Mkdir("testdata/windows/ro", 0500) - _ = create("testdata/windows/ro/readonly") - _ = os.Chmod("testdata/windows/ro/readonly", 0500) + os.Mkdir("testdata/windows", 0500) + os.Mkdir("testdata/windows/ro", 0500) + create("testdata/windows/ro/readonly") + os.Chmod("testdata/windows/ro/readonly", 0500) fs := fs.NewFilesystem(fs.FilesystemTypeBasic, ".") @@ -128,8 +128,8 @@ func TestInWritableDirWindowsRemoveAll(t *testing.T) { if err != nil { t.Fatal(err) } - defer func() { _ = os.Chmod("testdata/windows/ro/readonlynew", 0700) }() - defer func() { _ = os.RemoveAll("testdata") }() + defer os.Chmod("testdata/windows/ro/readonlynew", 0700) + defer os.RemoveAll("testdata") create := func(name string) error { fd, err := os.Create(name) @@ -140,12 +140,12 @@ func TestInWritableDirWindowsRemoveAll(t *testing.T) { return nil } - _ = os.Mkdir("testdata", 0700) + os.Mkdir("testdata", 0700) - _ = os.Mkdir("testdata/windows", 0500) - _ = os.Mkdir("testdata/windows/ro", 0500) - _ = create("testdata/windows/ro/readonly") - _ = os.Chmod("testdata/windows/ro/readonly", 0500) + os.Mkdir("testdata/windows", 0500) + os.Mkdir("testdata/windows/ro", 0500) + create("testdata/windows/ro/readonly") + os.Chmod("testdata/windows/ro/readonly", 0500) if err := os.RemoveAll("testdata/windows"); err != nil { t.Errorf("Unexpected error: %s", err) @@ -162,8 +162,8 @@ func TestInWritableDirWindowsRename(t *testing.T) { if err != nil { t.Fatal(err) } - defer func() { _ = os.Chmod("testdata/windows/ro/readonlynew", 0700) }() - defer func() { _ = os.RemoveAll("testdata") }() + defer os.Chmod("testdata/windows/ro/readonlynew", 0700) + defer os.RemoveAll("testdata") create := func(name string) error { fd, err := os.Create(name) @@ -174,12 +174,12 @@ func TestInWritableDirWindowsRename(t *testing.T) { return nil } - _ = os.Mkdir("testdata", 0700) + os.Mkdir("testdata", 0700) - _ = os.Mkdir("testdata/windows", 0500) - _ = os.Mkdir("testdata/windows/ro", 0500) - _ = create("testdata/windows/ro/readonly") - _ = os.Chmod("testdata/windows/ro/readonly", 0500) + os.Mkdir("testdata/windows", 0500) + os.Mkdir("testdata/windows/ro", 0500) + create("testdata/windows/ro/readonly") + os.Chmod("testdata/windows/ro/readonly", 0500) fs := fs.NewFilesystem(fs.FilesystemTypeBasic, ".") @@ -232,7 +232,7 @@ func TestIsDeleted(t *testing.T) { testFs := fs.NewFilesystem(fs.FilesystemTypeBasic, "testdata") - _ = testFs.MkdirAll("dir", 0777) + testFs.MkdirAll("dir", 0777) for _, f := range []string{"file", "del.file", "dir.file", "dir/file"} { fd, err := testFs.Create(f) if err != nil { @@ -242,7 +242,7 @@ func TestIsDeleted(t *testing.T) { } if runtime.GOOS != "windows" { // Can't create unreadable dir on windows - _ = testFs.MkdirAll("inacc", 0777) + testFs.MkdirAll("inacc", 0777) if err := testFs.Chmod("inacc", 0000); err == nil { if _, err := testFs.Lstat("inacc/file"); fs.IsPermission(err) { // May fail e.g. if tests are run as root -> just skip @@ -265,6 +265,6 @@ func TestIsDeleted(t *testing.T) { } } - _ = testFs.Chmod("inacc", 0777) + testFs.Chmod("inacc", 0777) os.RemoveAll("testdata") } diff --git a/lib/osutil/traversessymlink_test.go b/lib/osutil/traversessymlink_test.go index a8228a5d2..b69affaac 100644 --- a/lib/osutil/traversessymlink_test.go +++ b/lib/osutil/traversessymlink_test.go @@ -25,7 +25,7 @@ func TestTraversesSymlink(t *testing.T) { defer os.RemoveAll(tmpDir) fs := fs.NewFilesystem(fs.FilesystemTypeBasic, tmpDir) - _ = fs.MkdirAll("a/b/c", 0755) + fs.MkdirAll("a/b/c", 0755) if err = osutil.DebugSymlinkForTestsOnly(filepath.Join(fs.URI(), "a", "b"), filepath.Join(fs.URI(), "a", "l")); err != nil { if runtime.GOOS == "windows" { t.Skip("Symlinks aren't working") @@ -78,7 +78,7 @@ func TestIssue4875(t *testing.T) { defer os.RemoveAll(tmpDir) testFs := fs.NewFilesystem(fs.FilesystemTypeBasic, tmpDir) - _ = testFs.MkdirAll("a/b/c", 0755) + testFs.MkdirAll("a/b/c", 0755) if err = osutil.DebugSymlinkForTestsOnly(filepath.Join(testFs.URI(), "a", "b"), filepath.Join(testFs.URI(), "a", "l")); err != nil { if runtime.GOOS == "windows" { t.Skip("Symlinks aren't working") @@ -107,7 +107,7 @@ func BenchmarkTraversesSymlink(b *testing.B) { os.RemoveAll("testdata") defer os.RemoveAll("testdata") fs := fs.NewFilesystem(fs.FilesystemTypeBasic, "testdata") - _ = fs.MkdirAll("a/b/c", 0755) + fs.MkdirAll("a/b/c", 0755) for i := 0; i < b.N; i++ { traversesSymlinkResult = osutil.TraversesSymlink(fs, "a/b/c") diff --git a/lib/protocol/benchmark_test.go b/lib/protocol/benchmark_test.go index 99b68bf1e..308d7cc13 100644 --- a/lib/protocol/benchmark_test.go +++ b/lib/protocol/benchmark_test.go @@ -132,8 +132,8 @@ func getTCPConnectionPair() (net.Conn, net.Conn, error) { } // Set the buffer sizes etc as usual - _ = dialer.SetTCPOptions(conn0) - _ = dialer.SetTCPOptions(conn1) + dialer.SetTCPOptions(conn0) + dialer.SetTCPOptions(conn1) return conn0, conn1, nil } diff --git a/lib/protocol/deviceid.go b/lib/protocol/deviceid.go index 704fe327e..015080387 100644 --- a/lib/protocol/deviceid.go +++ b/lib/protocol/deviceid.go @@ -35,7 +35,7 @@ func repeatedDeviceID(v byte) (d DeviceID) { func NewDeviceID(rawCert []byte) DeviceID { var n DeviceID hf := sha256.New() - _, _ = hf.Write(rawCert) + hf.Write(rawCert) hf.Sum(n[:0]) return n } diff --git a/lib/protocol/protocol_test.go b/lib/protocol/protocol_test.go index edbd5cbb8..b567b6270 100644 --- a/lib/protocol/protocol_test.go +++ b/lib/protocol/protocol_test.go @@ -69,8 +69,8 @@ func TestClose(t *testing.T) { t.Error("Ping should not return true") } - _ = c0.Index("default", nil) - _ = c0.Index("default", nil) + c0.Index("default", nil) + c0.Index("default", nil) if _, err := c0.Request("default", "foo", 0, 0, nil, 0, false); err == nil { t.Error("Request should return an error") @@ -225,8 +225,8 @@ func testMarshal(t *testing.T, prefix string, m1, m2 message) bool { bs1, _ := json.MarshalIndent(m1, "", " ") bs2, _ := json.MarshalIndent(m2, "", " ") if !bytes.Equal(bs1, bs2) { - _ = ioutil.WriteFile(prefix+"-1.txt", bs1, 0644) - _ = ioutil.WriteFile(prefix+"-2.txt", bs2, 0644) + ioutil.WriteFile(prefix+"-1.txt", bs1, 0644) + ioutil.WriteFile(prefix+"-2.txt", bs2, 0644) return false } diff --git a/lib/rand/random.go b/lib/rand/random.go index 689ea3c4a..23a2f255e 100644 --- a/lib/rand/random.go +++ b/lib/rand/random.go @@ -67,7 +67,7 @@ func Intn(n int) int { // suitable for use a predictable random seed. func SeedFromBytes(bs []byte) int64 { h := md5.New() - _, _ = h.Write(bs) + h.Write(bs) s := h.Sum(nil) // The MD5 hash of the byte slice is 16 bytes long. We interpret it as two // uint64s and XOR them together. diff --git a/lib/rc/rc.go b/lib/rc/rc.go index 327a435c9..21004fef5 100644 --- a/lib/rc/rc.go +++ b/lib/rc/rc.go @@ -114,7 +114,7 @@ func (p *Process) Start(bin string, args ...string) error { } func (p *Process) wait() { - _ = p.cmd.Wait() + p.cmd.Wait() if p.logfd != nil { p.stopErr = p.checkForProblems(p.logfd) diff --git a/lib/relay/client/methods.go b/lib/relay/client/methods.go index 299f78223..6e4f1213e 100644 --- a/lib/relay/client/methods.go +++ b/lib/relay/client/methods.go @@ -27,7 +27,7 @@ func GetInvitationFromRelay(uri *url.URL, id syncthingprotocol.DeviceID, certs [ } conn := tls.Client(rconn, configForCerts(certs)) - _ = conn.SetDeadline(time.Now().Add(timeout)) + conn.SetDeadline(time.Now().Add(timeout)) if err := performHandshakeAndValidation(conn, uri); err != nil { return protocol.SessionInvitation{}, err @@ -75,7 +75,7 @@ func JoinSession(invitation protocol.SessionInvitation) (net.Conn, error) { Key: invitation.Key, } - _ = conn.SetDeadline(time.Now().Add(10 * time.Second)) + conn.SetDeadline(time.Now().Add(10 * time.Second)) err = protocol.WriteMessage(conn, request) if err != nil { return nil, err @@ -86,7 +86,7 @@ func JoinSession(invitation protocol.SessionInvitation) (net.Conn, error) { return nil, err } - _ = conn.SetDeadline(time.Time{}) + conn.SetDeadline(time.Time{}) switch msg := message.(type) { case protocol.Response: diff --git a/lib/scanner/blocks.go b/lib/scanner/blocks.go index 477dfff0e..3d3e641ec 100644 --- a/lib/scanner/blocks.go +++ b/lib/scanner/blocks.go @@ -116,7 +116,7 @@ func Validate(buf, hash []byte, weakHash uint32) bool { return true } // Copy error or mismatch, go to next algo. - _, _ = rd.Seek(0, io.SeekStart) + rd.Seek(0, io.SeekStart) } if len(hash) > 0 { diff --git a/lib/scanner/blocks_test.go b/lib/scanner/blocks_test.go index 12c64bbd2..99f1a7164 100644 --- a/lib/scanner/blocks_test.go +++ b/lib/scanner/blocks_test.go @@ -112,10 +112,10 @@ func TestAdler32Variants(t *testing.T) { hf2 := rollingAdler32.New() checkFn := func(data []byte) bool { - _, _ = hf1.Write(data) + hf1.Write(data) sum1 := hf1.Sum32() - _, _ = hf2.Write(data) + hf2.Write(data) sum2 := hf2.Sum32() hf1.Reset() @@ -127,7 +127,7 @@ func TestAdler32Variants(t *testing.T) { // protocol block sized data data := make([]byte, protocol.MinBlockSize) for i := 0; i < 5; i++ { - _, _ = rand.Read(data) + rand.Read(data) if !checkFn(data) { t.Errorf("Hash mismatch on block sized data") } @@ -145,13 +145,13 @@ func TestAdler32Variants(t *testing.T) { windowSize := 128 hf3 := rollingAdler32.New() - _, _ = hf3.Write(data[:windowSize]) + hf3.Write(data[:windowSize]) for i := windowSize; i < len(data); i++ { if i%windowSize == 0 { // let the reference function catch up hf2.Reset() - _, _ = hf2.Write(data[i-windowSize : i]) + hf2.Write(data[i-windowSize : i]) // verify that they are in sync with the rolling function sum2 := hf2.Sum32() diff --git a/lib/scanner/walk.go b/lib/scanner/walk.go index 6dabf1b46..e08574f17 100644 --- a/lib/scanner/walk.go +++ b/lib/scanner/walk.go @@ -108,10 +108,10 @@ func (w *walker) walk(ctx context.Context) chan ScanResult { go func() { hashFiles := w.walkAndHashFiles(ctx, toHashChan, finishedChan) if len(w.Subs) == 0 { - _ = w.Filesystem.Walk(".", hashFiles) + w.Filesystem.Walk(".", hashFiles) } else { for _, sub := range w.Subs { - _ = w.Filesystem.Walk(sub, hashFiles) + w.Filesystem.Walk(sub, hashFiles) } } close(toHashChan) @@ -223,7 +223,7 @@ func (w *walker) walkAndHashFiles(ctx context.Context, toHashChan chan<- protoco if fs.IsTemporary(path) { l.Debugln("temporary:", path, "err:", err) if err == nil && info.IsRegular() && info.ModTime().Add(w.TempLifetime).Before(now) { - _ = w.Filesystem.Remove(path) + w.Filesystem.Remove(path) l.Debugln("removing temporary:", path, info.ModTime()) } return nil diff --git a/lib/scanner/walk_test.go b/lib/scanner/walk_test.go index 0b1766722..74725a51b 100644 --- a/lib/scanner/walk_test.go +++ b/lib/scanner/walk_test.go @@ -216,7 +216,7 @@ func TestNormalization(t *testing.T) { if fd, err := testFs.OpenFile(filepath.Join("normalization", s1, s2), os.O_CREATE|os.O_EXCL, 0644); err != nil { t.Fatal(err) } else { - _, _ = fd.Write([]byte("test")) + fd.Write([]byte("test")) fd.Close() } } @@ -257,7 +257,7 @@ func TestIssue1507(t *testing.T) { f := make(chan ScanResult, 100) fn := w.walkAndHashFiles(context.TODO(), h, f) - _ = fn("", nil, protocol.ErrClosed) + fn("", nil, protocol.ErrClosed) } func TestWalkSymlinkUnix(t *testing.T) { @@ -268,9 +268,9 @@ func TestWalkSymlinkUnix(t *testing.T) { // Create a folder with a symlink in it os.RemoveAll("_symlinks") - _ = os.Mkdir("_symlinks", 0755) + os.Mkdir("_symlinks", 0755) defer os.RemoveAll("_symlinks") - _ = os.Symlink("../testdata", "_symlinks/link") + os.Symlink("../testdata", "_symlinks/link") fs := fs.NewFilesystem(fs.FilesystemTypeBasic, "_symlinks") for _, path := range []string{".", "link"} { @@ -298,7 +298,7 @@ func TestWalkSymlinkWindows(t *testing.T) { // Create a folder with a symlink in it name := "_symlinks-win" os.RemoveAll(name) - _ = os.Mkdir(name, 0755) + os.Mkdir(name, 0755) defer os.RemoveAll(name) fs := fs.NewFilesystem(fs.FilesystemTypeBasic, name) if err := osutil.DebugSymlinkForTestsOnly("../testdata", "_symlinks/link"); err != nil { diff --git a/lib/sha256/sha256.go b/lib/sha256/sha256.go index e9188a4fc..c301f4542 100644 --- a/lib/sha256/sha256.go +++ b/lib/sha256/sha256.go @@ -115,12 +115,12 @@ func cpuBenchOnce(duration time.Duration, newFn func() hash.Hash) float64 { chunkSize := 100 * 1 << 10 h := newFn() bs := make([]byte, chunkSize) - _, _ = rand.Reader.Read(bs) + rand.Reader.Read(bs) t0 := time.Now() b := 0 for time.Since(t0) < duration { - _, _ = h.Write(bs) + h.Write(bs) b += chunkSize } h.Sum(nil) @@ -146,7 +146,7 @@ func verifyCorrectness() { input := "Syncthing Magic Testing Value\n" h := New() - _, _ = h.Write([]byte(input)) + h.Write([]byte(input)) sum := hex.EncodeToString(h.Sum(nil)) if sum != correct { panic("sha256 is broken") diff --git a/lib/tlsutil/tlsutil.go b/lib/tlsutil/tlsutil.go index c8c11fc0d..8b8014f8a 100644 --- a/lib/tlsutil/tlsutil.go +++ b/lib/tlsutil/tlsutil.go @@ -186,9 +186,9 @@ func (l *DowngradingListener) AcceptNoWrapTLS() (net.Conn, bool, error) { } var first [1]byte - _ = conn.SetReadDeadline(time.Now().Add(1 * time.Second)) + conn.SetReadDeadline(time.Now().Add(1 * time.Second)) n, err := conn.Read(first[:]) - _ = conn.SetReadDeadline(time.Time{}) + conn.SetReadDeadline(time.Time{}) if err != nil || n == 0 { // We hit a read error here, but the Accept() call succeeded so we must not return an error. // We return the connection as is with a special error which handles this @@ -308,7 +308,7 @@ JpJcUNtrf1XK49IlpWW1Ds8seQsSg7/9BQ== c := tls.Client(c0, clientCfg) go func() { - _ = c.Handshake() + c.Handshake() }() s := tls.Server(c1, serverCfg) diff --git a/lib/upgrade/upgrade_supported.go b/lib/upgrade/upgrade_supported.go index 3d862d914..0fadbb3d1 100644 --- a/lib/upgrade/upgrade_supported.go +++ b/lib/upgrade/upgrade_supported.go @@ -202,7 +202,7 @@ func upgradeToURL(archiveName, binary string, url string) error { return err } if err := os.Rename(fname, binary); err != nil { - _ = os.Rename(old, binary) + os.Rename(old, binary) return err } return nil diff --git a/lib/versioner/simple.go b/lib/versioner/simple.go index ac1611d48..79dad81c5 100644 --- a/lib/versioner/simple.go +++ b/lib/versioner/simple.go @@ -59,8 +59,8 @@ func (v Simple) Archive(filePath string) error { if err != nil { if fs.IsNotExist(err) { l.Debugln("creating versions dir .stversions") - _ = v.fs.Mkdir(versionsDir, 0755) - _ = v.fs.Hide(versionsDir) + v.fs.Mkdir(versionsDir, 0755) + v.fs.Hide(versionsDir) } else { return err } diff --git a/lib/versioner/staggered.go b/lib/versioner/staggered.go index 639c9119a..beea0aa67 100644 --- a/lib/versioner/staggered.go +++ b/lib/versioner/staggered.go @@ -239,8 +239,8 @@ func (v *Staggered) Archive(filePath string) error { if _, err := v.versionsFs.Stat("."); err != nil { if fs.IsNotExist(err) { l.Debugln("creating versions dir", v.versionsFs) - _ = v.versionsFs.MkdirAll(".", 0755) - _ = v.versionsFs.Hide(".") + v.versionsFs.MkdirAll(".", 0755) + v.versionsFs.Hide(".") } else { return err } diff --git a/lib/versioner/staggered_test.go b/lib/versioner/staggered_test.go index b405b261c..cd84c069f 100644 --- a/lib/versioner/staggered_test.go +++ b/lib/versioner/staggered_test.go @@ -60,7 +60,7 @@ func TestStaggeredVersioningVersionCount(t *testing.T) { } sort.Strings(delete) - _ = os.MkdirAll("testdata/.stversions", 0755) + os.MkdirAll("testdata/.stversions", 0755) defer os.RemoveAll("testdata") v := NewStaggered("", fs.NewFilesystem(fs.FilesystemTypeBasic, "testdata"), map[string]string{"maxAge": strconv.Itoa(365 * 86400)}).(*Staggered) diff --git a/lib/versioner/trashcan.go b/lib/versioner/trashcan.go index 5f2379c58..70e65ac83 100644 --- a/lib/versioner/trashcan.go +++ b/lib/versioner/trashcan.go @@ -65,7 +65,7 @@ func (t *Trashcan) Archive(filePath string) error { if err := t.fs.MkdirAll(versionsDir, 0777); err != nil { return err } - _ = t.fs.Hide(versionsDir) + t.fs.Hide(versionsDir) } l.Debugln("archiving", filePath) @@ -84,7 +84,7 @@ func (t *Trashcan) Archive(filePath string) error { // Set the mtime to the time the file was deleted. This is used by the // cleanout routine. If this fails things won't work optimally but there's // not much we can do about it so we ignore the error. - _ = t.fs.Chtimes(archivedPath, time.Now(), time.Now()) + t.fs.Chtimes(archivedPath, time.Now(), time.Now()) return nil } @@ -144,7 +144,7 @@ func (t *Trashcan) cleanoutArchive() error { if info.ModTime().Before(cutoff) { // The file is too old; remove it. - _ = t.fs.Remove(path) + t.fs.Remove(path) } else { // Keep this file, and remember it so we don't unnecessarily try // to remove this directory. diff --git a/lib/versioner/trashcan_test.go b/lib/versioner/trashcan_test.go index e7f5b122b..023e5806b 100644 --- a/lib/versioner/trashcan_test.go +++ b/lib/versioner/trashcan_test.go @@ -42,7 +42,7 @@ func TestTrashcanCleanout(t *testing.T) { oldTime := time.Now().Add(-8 * 24 * time.Hour) for _, tc := range testcases { - _ = os.MkdirAll(filepath.Dir(tc.file), 0777) + os.MkdirAll(filepath.Dir(tc.file), 0777) if err := ioutil.WriteFile(tc.file, []byte("data"), 0644); err != nil { t.Fatal(err) } diff --git a/lib/weakhash/benchmark_test.go b/lib/weakhash/benchmark_test.go index 1829e5b8a..0eb6aae39 100644 --- a/lib/weakhash/benchmark_test.go +++ b/lib/weakhash/benchmark_test.go @@ -42,17 +42,17 @@ func BenchmarkWeakHashAdler32(b *testing.B) { hf := adler32.New() for i := 0; i < b.N; i++ { - _, _ = hf.Write(data) + hf.Write(data) } - _ = hf.Sum32() + hf.Sum32() b.SetBytes(size) } func BenchmarkWeakHashAdler32Roll(b *testing.B) { data := make([]byte, size) hf := adler32.New() - _, _ = hf.Write(data) + hf.Write(data) b.ResetTimer() @@ -70,10 +70,10 @@ func BenchmarkWeakHashRabinKarp64(b *testing.B) { hf := rabinkarp64.New() for i := 0; i < b.N; i++ { - _, _ = hf.Write(data) + hf.Write(data) } - _ = hf.Sum64() + hf.Sum64() b.SetBytes(size) } @@ -101,7 +101,7 @@ func BenchmarkWeakHashBozo32(b *testing.B) { hf.Write(data) } - _ = hf.Sum32() + hf.Sum32() b.SetBytes(size) } @@ -129,7 +129,7 @@ func BenchmarkWeakHashBuzhash32(b *testing.B) { hf.Write(data) } - _ = hf.Sum32() + hf.Sum32() b.SetBytes(size) } @@ -157,7 +157,7 @@ func BenchmarkWeakHashBuzhash64(b *testing.B) { hf.Write(data) } - _ = hf.Sum64() + hf.Sum64() b.SetBytes(size) } diff --git a/test/util.go b/test/util.go index 40fdc6566..7e4d24287 100644 --- a/test/util.go +++ b/test/util.go @@ -94,7 +94,7 @@ func generateOneFile(fd io.ReadSeeker, p1 string, s int64) error { return err } - _ = os.Chmod(p1, os.FileMode(rand.Intn(0777)|0400)) + os.Chmod(p1, os.FileMode(rand.Intn(0777)|0400)) t := time.Now().Add(-time.Duration(rand.Intn(30*86400)) * time.Second) err = os.Chtimes(p1, t, t)