|
@@ -15,7 +15,7 @@ const (
|
15
|
15
|
|
16
|
16
|
// List holds a list of ISUPPORT tokens
|
17
|
17
|
type List struct {
|
18
|
|
- Tokens map[string]*string
|
|
18
|
+ Tokens map[string]string
|
19
|
19
|
CachedReply [][]string
|
20
|
20
|
}
|
21
|
21
|
|
|
@@ -27,27 +27,27 @@ func NewList() *List {
|
27
|
27
|
}
|
28
|
28
|
|
29
|
29
|
func (il *List) Initialize() {
|
30
|
|
- il.Tokens = make(map[string]*string)
|
|
30
|
+ il.Tokens = make(map[string]string)
|
31
|
31
|
il.CachedReply = make([][]string, 0)
|
32
|
32
|
}
|
33
|
33
|
|
34
|
34
|
// Add adds an RPL_ISUPPORT token to our internal list
|
35
|
35
|
func (il *List) Add(name string, value string) {
|
36
|
|
- il.Tokens[name] = &value
|
|
36
|
+ il.Tokens[name] = value
|
37
|
37
|
}
|
38
|
38
|
|
39
|
39
|
// AddNoValue adds an RPL_ISUPPORT token that does not have a value
|
40
|
40
|
func (il *List) AddNoValue(name string) {
|
41
|
|
- il.Tokens[name] = nil
|
|
41
|
+ il.Tokens[name] = ""
|
42
|
42
|
}
|
43
|
43
|
|
44
|
44
|
// getTokenString gets the appropriate string for a token+value.
|
45
|
|
-func getTokenString(name string, value *string) string {
|
46
|
|
- if value == nil || len(*value) == 0 {
|
|
45
|
+func getTokenString(name string, value string) string {
|
|
46
|
+ if len(value) == 0 {
|
47
|
47
|
return name
|
48
|
48
|
}
|
49
|
49
|
|
50
|
|
- return fmt.Sprintf("%s=%s", name, *value)
|
|
50
|
+ return fmt.Sprintf("%s=%s", name, value)
|
51
|
51
|
}
|
52
|
52
|
|
53
|
53
|
// GetDifference returns the difference between two token lists.
|
|
@@ -69,7 +69,7 @@ func (il *List) GetDifference(newil *List) [][]string {
|
69
|
69
|
// append added tokens
|
70
|
70
|
for name, value := range newil.Tokens {
|
71
|
71
|
newval, exists := il.Tokens[name]
|
72
|
|
- if exists && ((value == nil && newval == nil) || (value != nil && newval != nil && *value == *newval)) {
|
|
72
|
+ if exists && value == newval {
|
73
|
73
|
continue
|
74
|
74
|
}
|
75
|
75
|
|