felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

lib/model: Add missing error assignment + Remove unused argument (#7922)

Browse Source
This commit is contained in:
greatroar
2021-09-01 22:03:06 +02:00
committed by GitHub
parent 7be1f0a71c
commit 3b2239357f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/model/folder_sendrecv.go
+3 -3
View File
@@ -387,7 +387,7 @@ func (f *sendReceiveFolder) processNeeded(snap *db.Snapshot, dbUpdateChan chan<-
// We are supposed to copy the entire file, and then fetch nothing. We // We are supposed to copy the entire file, and then fetch nothing. We
// are only updating metadata, so we don't actually *need* to make the // are only updating metadata, so we don't actually *need* to make the
// copy. // copy.
f.shortcutFile(file, curFile, dbUpdateChan) f.shortcutFile(file, dbUpdateChan)
} else { } else {
// Queue files for processing after directories and symlinks. // Queue files for processing after directories and symlinks.
f.queue.Push(file.Name, file.Size, file.ModTime()) f.queue.Push(file.Name, file.Size, file.ModTime())
@@ -743,7 +743,7 @@ func (f *sendReceiveFolder) handleSymlink(file protocol.FileInfo, snap *db.Snaps
return return
} }
if f.handleSymlinkCheckExisting(file, snap, scanChan); err != nil { if err = f.handleSymlinkCheckExisting(file, snap, scanChan); err != nil {
f.newPullError(file.Name, fmt.Errorf("handling symlink: %w", err)) f.newPullError(file.Name, fmt.Errorf("handling symlink: %w", err))
return return
} }
@@ -1199,7 +1199,7 @@ func populateOffsets(blocks []protocol.BlockInfo) {
// shortcutFile sets file mode and modification time, when that's the only // shortcutFile sets file mode and modification time, when that's the only
// thing that has changed. // thing that has changed.
func (f *sendReceiveFolder) shortcutFile(file, curFile protocol.FileInfo, dbUpdateChan chan<- dbUpdateJob) { func (f *sendReceiveFolder) shortcutFile(file protocol.FileInfo, dbUpdateChan chan<- dbUpdateJob) {
l.Debugln(f, "taking shortcut on", file.Name) l.Debugln(f, "taking shortcut on", file.Name)
f.evLogger.Log(events.ItemStarted, map[string]string{ f.evLogger.Log(events.ItemStarted, map[string]string{