Changeset 161 in code for trunk

Timestamp:

Mar 26, 2020, 9:28:13 PM (5 years ago)

Author:

delthas

Message:

Fix capitalization of 'id'

Following the Go project source code guidelines, id is an abbreviation
and must typically be written as id or ID, not Id.

File:

• trunk/upstream.go (modified) (14 diffs)

trunk/upstream.go

@@ -55 +55 @@
         tagsSupported   bool
         labelsSupported bool
-        nextLabelId     uint64
+        nextLabelID     uint64
 
         saslClient  sasl.Client
@@ -131 +131 @@
 }
 
-func (uc *upstreamConn) forEachDownstreamById(id uint64, f func(*downstreamConn)) {
+func (uc *upstreamConn) forEachDownstreamByID(id uint64, f func(*downstreamConn)) {
         uc.forEachDownstream(func(dc *downstreamConn) {
                 if id != 0 && id != dc.id {
@@ -182 +182 @@
         }
 
-        var downstreamId uint64 = 0
+        var downstreamID uint64 = 0
         if label != "" {
                 var labelOffset uint64
-                n, err := fmt.Sscanf(label, "sd-%d-%d", &downstreamId, &labelOffset)
+                n, err := fmt.Sscanf(label, "sd-%d-%d", &downstreamID, &labelOffset)
                 if err == nil && n < 2 {
                         err = errors.New("not enough arguments")
@@ -789 +789 @@
                 if !ok {
                         // NAMES on a channel we have not joined, forward to downstream
-                        uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
+                        uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
                                 channel := dc.marshalChannel(uc, name)
                                 members := strings.Split(members, " ")
@@ -826 +826 @@
                 if !ok {
                         // NAMES on a channel we have not joined, forward to downstream
-                        uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
+                        uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
                                 channel := dc.marshalChannel(uc, name)
 
@@ -865 +865 @@
                 trailing = strconv.Itoa(hops) + " " + realname
 
-                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
                         channel := channel
                         if channel != "*" {
@@ -883 +883 @@
                 }
 
-                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
                         name := name
                         if name != "*" {
@@ -901 +901 @@
                 }
 
-                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
                         nick := dc.marshalNick(uc, nick)
                         dc.SendMessage(&irc.Message{
@@ -915 +915 @@
                 }
 
-                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
                         nick := dc.marshalNick(uc, nick)
                         dc.SendMessage(&irc.Message{
@@ -929 +929 @@
                 }
 
-                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
                         nick := dc.marshalNick(uc, nick)
                         dc.SendMessage(&irc.Message{
@@ -943 +943 @@
                 }
 
-                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
                         nick := dc.marshalNick(uc, nick)
                         params := []string{dc.nick, nick}
@@ -960 +960 @@
                 channels := strings.Split(channelList, " ")
 
-                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
                         nick := dc.marshalNick(uc, nick)
                         channelList := make([]string, len(channels))
@@ -981 +981 @@
                 }
 
-                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
                         nick := dc.marshalNick(uc, nick)
                         dc.SendMessage(&irc.Message{
@@ -1159 +1159 @@
                         msg.Tags = make(map[string]irc.TagValue)
                 }
-                msg.Tags["label"] = irc.TagValue(fmt.Sprintf("sd-%d-%d", dc.id, uc.nextLabelId))
-                uc.nextLabelId++
+                msg.Tags["label"] = irc.TagValue(fmt.Sprintf("sd-%d-%d", dc.id, uc.nextLabelID))
+                uc.nextLabelID++
         }
         uc.SendMessage(msg)