octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-09-19 13:19:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix in-place removal

Browse Source
This commit is contained in:
Audrius Butkevicius 2014-07-28 00:08:15 +01:00
parent 3b65a58f59
commit 2546930a1a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/config.go
View File

@ -403,16 +403,18 @@ func ensureNodePresent(nodes []NodeConfiguration, myID protocol.NodeID) []NodeCo
}
func ensureExistingNodes(nodes []NodeConfiguration, existingNodes map[protocol.NodeID]bool) []NodeConfiguration {
count := len(nodes)
i := 0
for _, node := range nodes {
if _, ok := existingNodes[node.NodeID]; !ok {
last := len(nodes) - 1
nodes[i] = nodes[last]
nodes = nodes[:last]
} else {
loop:
for i < count {
if _, ok := existingNodes[nodes[i].NodeID]; !ok {
nodes[i] = nodes[count-1]
count--
continue loop
}
i++
}
}
nodes = nodes[0:count]
sort.Sort(NodeConfigurationList(nodes))