From 3ed9b8d6983cdc301d53677d22fc8e7d8347a0fa Mon Sep 17 00:00:00 2001
From: wdvxdr <wdvxdr1123@gmail.com>
Date: Thu, 12 Aug 2021 23:28:21 +0800
Subject: [PATCH] clean(jce): remove ReadMapF.

---
 binary/jce/reader.go  | 15 ---------------
 binary/jce/structs.go |  8 +-------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/binary/jce/reader.go b/binary/jce/reader.go
index 9ff7f626..f46b9b47 100644
--- a/binary/jce/reader.go
+++ b/binary/jce/reader.go
@@ -360,21 +360,6 @@ func (r *JceReader) ReadMap(i interface{}, tag int) {
 	}
 }
 
-func (r *JceReader) _ReadMapF(tag int, f func(interface{}, interface{})) {
-	if !r.skipToTag(tag) {
-		return
-	}
-	r.readHead()
-	s := r.ReadInt32(0)
-	for i := 0; i < int(s); i++ {
-		k := r.ReadAny(0)
-		v := r.ReadAny(1)
-		if k != nil {
-			f(k, v)
-		}
-	}
-}
-
 func (r *JceReader) readObject(t reflect.Type, tag int) reflect.Value {
 	switch t.Kind() {
 	case reflect.Int, reflect.Int16, reflect.Int32, reflect.Int64:
diff --git a/binary/jce/structs.go b/binary/jce/structs.go
index ed0669d5..2dbdc1ba 100644
--- a/binary/jce/structs.go
+++ b/binary/jce/structs.go
@@ -580,13 +580,7 @@ func (pkt *RequestDataVersion2) ToBytes() []byte {
 
 func (pkt *RequestDataVersion2) ReadFrom(r *JceReader) {
 	pkt.Map = make(map[string]map[string][]byte)
-	// r.ReadMap(pkt.Map, 0)
-	r._ReadMapF(0, func(k interface{}, v interface{}) {
-		pkt.Map[k.(string)] = make(map[string][]byte)
-		for k2, v := range v.(map[interface{}]interface{}) {
-			pkt.Map[k.(string)][k2.(string)] = v.([]byte)
-		}
-	})
+	r.ReadMap(pkt.Map, 0)
 }
 
 func (pkt *SsoServerInfo) ReadFrom(r *JceReader) {