Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Remove unused code (#5591)

This commit is contained in:
Simon Frei 2019-03-10 17:05:39 +01:00 committed by GitHub
parent 189e44488e
commit 3f3d2c814b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/model/model.go
View File

@ -1149,7 +1149,7 @@ func (m *model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
} }
} }
go sendIndexes(conn, folder.ID, fs, m.folderIgnores[folder.ID], startSequence, dropSymlinks) go sendIndexes(conn, folder.ID, fs, startSequence, dropSymlinks)
} }
m.pmut.Lock() m.pmut.Lock()
@ -1885,7 +1885,7 @@ func (m *model) receivedFile(folder string, file protocol.FileInfo) {
m.folderStatRef(folder).ReceivedFile(file.Name, file.IsDeleted()) m.folderStatRef(folder).ReceivedFile(file.Name, file.IsDeleted())
} }
func sendIndexes(conn protocol.Connection, folder string, fs *db.FileSet, ignores *ignore.Matcher, prevSequence int64, dropSymlinks bool) { func sendIndexes(conn protocol.Connection, folder string, fs *db.FileSet, prevSequence int64, dropSymlinks bool) {
deviceID := conn.ID() deviceID := conn.ID()
var err error var err error
@ -1893,7 +1893,7 @@ func sendIndexes(conn protocol.Connection, folder string, fs *db.FileSet, ignore
defer l.Debugf("Exiting sendIndexes for %s to %s at %s: %v", folder, deviceID, conn, err) defer l.Debugf("Exiting sendIndexes for %s to %s at %s: %v", folder, deviceID, conn, err)
// We need to send one index, regardless of whether there is something to send or not // We need to send one index, regardless of whether there is something to send or not
prevSequence, err = sendIndexTo(prevSequence, conn, folder, fs, ignores, dropSymlinks) prevSequence, err = sendIndexTo(prevSequence, conn, folder, fs, dropSymlinks)
// Subscribe to LocalIndexUpdated (we have new information to send) and // Subscribe to LocalIndexUpdated (we have new information to send) and
// DeviceDisconnected (it might be us who disconnected, so we should // DeviceDisconnected (it might be us who disconnected, so we should
@ -1916,7 +1916,7 @@ func sendIndexes(conn protocol.Connection, folder string, fs *db.FileSet, ignore
continue continue
} }
prevSequence, err = sendIndexTo(prevSequence, conn, folder, fs, ignores, dropSymlinks) prevSequence, err = sendIndexTo(prevSequence, conn, folder, fs, dropSymlinks)
// Wait a short amount of time before entering the next loop. If there // Wait a short amount of time before entering the next loop. If there
// are continuous changes happening to the local index, this gives us // are continuous changes happening to the local index, this gives us
@ -1927,7 +1927,7 @@ func sendIndexes(conn protocol.Connection, folder string, fs *db.FileSet, ignore
// sendIndexTo sends file infos with a sequence number higher than prevSequence and // sendIndexTo sends file infos with a sequence number higher than prevSequence and
// returns the highest sent sequence number. // returns the highest sent sequence number.
func sendIndexTo(prevSequence int64, conn protocol.Connection, folder string, fs *db.FileSet, ignores *ignore.Matcher, dropSymlinks bool) (int64, error) { func sendIndexTo(prevSequence int64, conn protocol.Connection, folder string, fs *db.FileSet, dropSymlinks bool) (int64, error) {
deviceID := conn.ID() deviceID := conn.ID()
initial := prevSequence == 0 initial := prevSequence == 0
batch := newFileInfoBatch(nil) batch := newFileInfoBatch(nil)