Skip to content

Commit 7d1fed0

Browse files
authored
Merge pull request #2966 from criciss/master
refactor: use the built-in max/min to simplify the code
2 parents 87a5c22 + 01b45be commit 7d1fed0

2 files changed

Lines changed: 3 additions & 12 deletions

File tree

middleware/body_dump.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,7 @@ func (w *limitedWriter) Write(b []byte) (n int, err error) {
189189
// Write to dump buffer only up to limit
190190
if w.dumped < w.limit {
191191
remaining := w.limit - w.dumped
192-
toDump := int64(n)
193-
if toDump > remaining {
194-
toDump = remaining
195-
}
192+
toDump := min(int64(n), remaining)
196193
w.dumpBuf.Write(b[:toDump])
197194
w.dumped += toDump
198195
}

router.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -558,10 +558,7 @@ func (r *DefaultRouter) insert(t kind, path string, method string, ri routeMetho
558558
lcpLen := 0
559559

560560
// LCP - Longest Common Prefix (https://en.wikipedia.org/wiki/LCP_array)
561-
maxL := prefixLen
562-
if searchLen < maxL {
563-
maxL = searchLen
564-
}
561+
maxL := min(searchLen, prefixLen)
565562
for ; lcpLen < maxL && search[lcpLen] == currentNode.prefix[lcpLen]; lcpLen++ {
566563
}
567564

@@ -867,10 +864,7 @@ func (r *DefaultRouter) Route(c *Context) HandlerFunc {
867864
prefixLen = len(currentNode.prefix)
868865

869866
// LCP - Longest Common Prefix (https://en.wikipedia.org/wiki/LCP_array)
870-
lMax := prefixLen
871-
if searchLen < lMax {
872-
lMax = searchLen
873-
}
867+
lMax := min(searchLen, prefixLen)
874868
for ; lcpLen < lMax && search[lcpLen] == currentNode.prefix[lcpLen]; lcpLen++ {
875869
}
876870
}

0 commit comments

Comments
 (0)