TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-20 13:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/art: use "index", not "idx" in function names

Browse Source 
Updates #7781

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2023-07-24 11:10:54 -07:00 committed by Dave Anderson
parent de5c6ed4be
commit 8478358d77
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/art/stride_table.go
View File

@ -85,16 +85,12 @@ func (t *strideTable[T]) deleteChild(idx int) {
// setChild replaces the child strideTable for addr (if any) with child. // setChild replaces the child strideTable for addr (if any) with child.
func (t *strideTable[T]) setChild(addr uint8, child *strideTable[T]) { func (t *strideTable[T]) setChild(addr uint8, child *strideTable[T]) {
idx := hostIndex(addr) t.setChildByIndex(hostIndex(addr), child)
if t.entries[idx].child == nil {
t.childRefs++
}
t.entries[idx].child = child
} }
// setChildByIdx replaces the child strideTable at idx (if any) with // setChildByIndex replaces the child strideTable at idx (if any) with
// child. idx should be obtained via a call to getChild. // child. idx should be obtained via a call to getChild.
func (t *strideTable[T]) setChildByIdx(idx int, child *strideTable[T]) { func (t *strideTable[T]) setChildByIndex(idx int, child *strideTable[T]) {
if t.entries[idx].child == nil { if t.entries[idx].child == nil {
t.childRefs++ t.childRefs++
} }

2
net/art/table.go
View File

@ -468,7 +468,7 @@ func (t *Table[T]) Delete(pfx netip.Prefix) {
if debugDelete { if debugDelete {
fmt.Printf("delete: compact parent.prefix=%s st.prefix=%s child.prefix=%s\n", parent.prefix, cur.prefix, child.prefix) fmt.Printf("delete: compact parent.prefix=%s st.prefix=%s child.prefix=%s\n", parent.prefix, cur.prefix, child.prefix)
} }
strideTables[strideIdx-1].setChildByIdx(strideIndexes[strideIdx-1], child) strideTables[strideIdx-1].setChildByIndex(strideIndexes[strideIdx-1], child)
return return
default: default:
// This table has two or more children, so it's acting as a "fork in // This table has two or more children, so it's acting as a "fork in