From b1ac38a61751dbfa89bc1a14951061645dea5a56 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 2 Dec 2014 14:55:06 -0600
Subject: [PATCH] iplist: Double performance of parsing line

---
 iplist/iplist.go | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/iplist/iplist.go b/iplist/iplist.go
index 5467c330..9fe9871e 100644
--- a/iplist/iplist.go
+++ b/iplist/iplist.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"net"
-	"regexp"
 	"sort"
 	"strings"
 )
@@ -50,24 +49,19 @@ func (me *IPList) Lookup(ip net.IP) (r *Range) {
 	return
 }
 
-var p2pBlocklistLineRe = regexp.MustCompile(`(.*):([\d.]+)-([\d.]+)`)
-
 // Parse a line of the PeerGuardian Text Lists (P2P) Format. Returns !ok but
 // no error if a line doesn't contain a range but isn't erroneous, such as
 // comment and blank lines.
 func ParseBlocklistP2PLine(l string) (r Range, ok bool, err error) {
 	l = strings.TrimSpace(l)
-	if l == "" || strings.HasPrefix(l, "#") {
+	if len(l) == 0 || strings.HasPrefix(l, "#") {
 		return
 	}
-	sms := p2pBlocklistLineRe.FindStringSubmatch(l)
-	if sms == nil {
-		err = fmt.Errorf("error parsing %q", l)
-		return
-	}
-	r.Description = sms[1]
-	r.First = net.ParseIP(sms[2])
-	r.Last = net.ParseIP(sms[3])
+	colon := strings.IndexByte(l, ':')
+	hyphen := strings.IndexByte(l[colon+1:], '-') + colon + 1
+	r.Description = l[:colon]
+	r.First = net.ParseIP(l[colon+1 : hyphen])
+	r.Last = net.ParseIP(l[hyphen+1:])
 	if r.First == nil || r.Last == nil {
 		return
 	}