]> Cypherpunks repositories - gostls13.git/commitdiff
net: use stringslite.HasPrefix
authorTobias Klauser <tklauser@distanz.ch>
Thu, 2 May 2024 18:29:29 +0000 (20:29 +0200)
committerGopher Robot <gobot@golang.org>
Thu, 2 May 2024 22:14:43 +0000 (22:14 +0000)
Change-Id: Ib14c70f580d0891b3fbedf9e4cde93077409d4e6
Reviewed-on: https://go-review.googlesource.com/c/go/+/582915
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Damien Neil <dneil@google.com>
src/net/dnsconfig_unix.go

index b0a318279b99b614e274dabea4cc0a462cd6f312..0fcf2c6cc38426c735f5ca0404c39218a5f8f1eb 100644 (file)
@@ -10,6 +10,7 @@ package net
 
 import (
        "internal/bytealg"
+       "internal/stringslite"
        "net/netip"
        "time"
 )
@@ -75,7 +76,7 @@ func dnsReadConfig(filename string) *dnsConfig {
                case "options": // magic options
                        for _, s := range f[1:] {
                                switch {
-                               case hasPrefix(s, "ndots:"):
+                               case stringslite.HasPrefix(s, "ndots:"):
                                        n, _, _ := dtoi(s[6:])
                                        if n < 0 {
                                                n = 0
@@ -83,13 +84,13 @@ func dnsReadConfig(filename string) *dnsConfig {
                                                n = 15
                                        }
                                        conf.ndots = n
-                               case hasPrefix(s, "timeout:"):
+                               case stringslite.HasPrefix(s, "timeout:"):
                                        n, _, _ := dtoi(s[8:])
                                        if n < 1 {
                                                n = 1
                                        }
                                        conf.timeout = time.Duration(n) * time.Second
-                               case hasPrefix(s, "attempts:"):
+                               case stringslite.HasPrefix(s, "attempts:"):
                                        n, _, _ := dtoi(s[9:])
                                        if n < 1 {
                                                n = 1
@@ -155,10 +156,6 @@ func dnsDefaultSearch() []string {
        return nil
 }
 
-func hasPrefix(s, prefix string) bool {
-       return len(s) >= len(prefix) && s[:len(prefix)] == prefix
-}
-
 func ensureRooted(s string) string {
        if len(s) > 0 && s[len(s)-1] == '.' {
                return s