From: Matt Joiner <anacrolix@gmail.com>
Date: Fri, 16 Feb 2018 01:14:15 +0000 (+1100)
Subject: Move clamp and max, and add min to misc.go
X-Git-Tag: v1.0.0~165
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=646622b8f15f9dc46c33d503a16c260cfe4b5dac;p=btrtrc.git

Move clamp and max, and add min to misc.go
---

diff --git a/connection.go b/connection.go
index a12d8e65..6f63945d 100644
--- a/connection.go
+++ b/connection.go
@@ -314,29 +314,6 @@ func (cn *connection) requestedMetadataPiece(index int) bool {
 	return index < len(cn.metadataRequests) && cn.metadataRequests[index]
 }
 
-func clamp(min, value, max int64) int64 {
-	if min > max {
-		panic("harumph")
-	}
-	if value < min {
-		value = min
-	}
-	if value > max {
-		value = max
-	}
-	return value
-}
-
-func max(as ...int64) int64 {
-	ret := as[0]
-	for _, a := range as[1:] {
-		if a > ret {
-			ret = a
-		}
-	}
-	return ret
-}
-
 // The actual value to use as the maximum outbound requests.
 func (cn *connection) nominalMaxRequests() (ret int) {
 	return int(clamp(1, int64(cn.PeerMaxRequests), max(64, cn.stats.ChunksReadUseful-(cn.stats.ChunksRead-cn.stats.ChunksReadUseful))))
diff --git a/misc.go b/misc.go
index 2d00ba55..c23910ea 100644
--- a/misc.go
+++ b/misc.go
@@ -130,3 +130,36 @@ func connIsIpv6(nc net.Conn) bool {
 	rip := missinggo.AddrIP(ra)
 	return rip.To4() == nil && rip.To16() != nil
 }
+
+func clamp(min, value, max int64) int64 {
+	if min > max {
+		panic("harumph")
+	}
+	if value < min {
+		value = min
+	}
+	if value > max {
+		value = max
+	}
+	return value
+}
+
+func max(as ...int64) int64 {
+	ret := as[0]
+	for _, a := range as[1:] {
+		if a > ret {
+			ret = a
+		}
+	}
+	return ret
+}
+
+func min(as ...int64) int64 {
+	ret := as[0]
+	for _, a := range as[1:] {
+		if a < ret {
+			ret = a
+		}
+	}
+	return ret
+}