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

Updates #7781

Signed-off-by: David Anderson <danderson@tailscale.com>
pull/8701/head
David Anderson 1 year ago committed by Dave Anderson
parent de5c6ed4be
commit 8478358d77

@ -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++
} }

@ -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

Loading…
Cancel
Save