From bc4e2293efa55c035a143dac326b85fb2e27b6cd Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Sun, 9 Apr 2017 00:31:06 +0200
Subject: [PATCH] remove errors.Format

---
 common/errors/errors.go          | 19 +------------------
 proxy/vmess/encoding/client.go   |  2 +-
 tools/conf/transport_internet.go |  4 ++--
 tools/geoip/geoip_gen.go         |  2 +-
 4 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/common/errors/errors.go b/common/errors/errors.go
index 7b1e6f823..4439828ff 100644
--- a/common/errors/errors.go
+++ b/common/errors/errors.go
@@ -2,7 +2,6 @@
 package errors
 
 import (
-	"fmt"
 	"strings"
 
 	"v2ray.com/core/common/serial"
@@ -28,23 +27,15 @@ type hasSeverity interface {
 
 // Error is an error object with underlying error.
 type Error struct {
-	format   string
 	message  []interface{}
 	inner    error
 	severity Severity
 	path     []string
 }
 
-func (v *Error) formMessage() string {
-	if len(v.format) == 0 {
-		return serial.Concat(v.message...)
-	}
-	return fmt.Sprintf(v.format, v.message...)
-}
-
 // Error implements error.Error().
 func (v *Error) Error() string {
-	msg := v.formMessage()
+	msg := serial.Concat(v.message...)
 	if v.inner != nil {
 		msg += " > " + v.inner.Error()
 	}
@@ -116,14 +107,6 @@ func New(msg ...interface{}) *Error {
 	}
 }
 
-func Format(format string, values ...interface{}) *Error {
-	return &Error{
-		format:   format,
-		message:  values,
-		severity: SeverityInfo,
-	}
-}
-
 // Cause returns the root cause of this error.
 func Cause(err error) error {
 	if err == nil {
diff --git a/proxy/vmess/encoding/client.go b/proxy/vmess/encoding/client.go
index a303a2721..374356b56 100644
--- a/proxy/vmess/encoding/client.go
+++ b/proxy/vmess/encoding/client.go
@@ -191,7 +191,7 @@ func (v *ClientSession) DecodeResponseHeader(reader io.Reader) (*protocol.Respon
 	}
 
 	if buffer[0] != v.responseHeader {
-		return nil, errors.Format("unexpected response header. Expecting %d but actually %d", v.responseHeader, buffer[0]).Path("Proxy", "VMess", "Encoding", "ClientSession")
+		return nil, errors.New("unexpected response header. Expecting ", int(v.responseHeader), " but actually ", int(buffer[0])).Path("Proxy", "VMess", "Encoding", "ClientSession")
 	}
 
 	header := &protocol.ResponseHeader{
diff --git a/tools/conf/transport_internet.go b/tools/conf/transport_internet.go
index 2ec2423ee..5b02deec5 100644
--- a/tools/conf/transport_internet.go
+++ b/tools/conf/transport_internet.go
@@ -45,14 +45,14 @@ func (v *KCPConfig) Build() (*serial.TypedMessage, error) {
 	if v.Mtu != nil {
 		mtu := *v.Mtu
 		if mtu < 576 || mtu > 1460 {
-			return nil, errors.Format("Config: Invalid mKCP MTU size: %d", mtu)
+			return nil, errors.New("Config: Invalid mKCP MTU size: ", mtu)
 		}
 		config.Mtu = &kcp.MTU{Value: mtu}
 	}
 	if v.Tti != nil {
 		tti := *v.Tti
 		if tti < 10 || tti > 100 {
-			return nil, errors.Format("Config: Invalid mKCP TTI: %d", tti)
+			return nil, errors.New("Config: Invalid mKCP TTI: ", tti)
 		}
 		config.Tti = &kcp.TTI{Value: tti}
 	}
diff --git a/tools/geoip/geoip_gen.go b/tools/geoip/geoip_gen.go
index 920c1a737..241e5671f 100644
--- a/tools/geoip/geoip_gen.go
+++ b/tools/geoip/geoip_gen.go
@@ -30,7 +30,7 @@ func main() {
 		panic(err)
 	}
 	if resp.StatusCode != 200 {
-		panic(errors.Format("Unexpected status %d", resp.StatusCode))
+		panic(errors.New("unexpected status ", resp.StatusCode))
 	}
 	defer resp.Body.Close()
 	scanner := bufio.NewScanner(resp.Body)