Changeset 181 in code for trunk

Timestamp:

Mar 28, 2020, 12:03:00 AM (5 years ago)

Author:

contact

Message:

s/List/LIST/ when referring to the command

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• upstream.go (modified) (7 diffs)
• user.go (modified) (1 diff)

trunk/downstream.go

@@ -1114 +1114 @@
                                 Params:  params,
                         }
-                        uc.trySendList(dc.id)
+                        uc.trySendLIST(dc.id)
                 })
         case "NAMES":

trunk/upstream.go

@@ -188 +188 @@
 }
 
-func (uc *upstreamConn) getPendingList() *pendingLIST {
+func (uc *upstreamConn) getPendingLIST() *pendingLIST {
         for _, pl := range uc.user.pendingLISTs {
                 if _, ok := pl.pendingCommands[uc.network.ID]; !ok {
@@ -198 +198 @@
 }
 
-func (uc *upstreamConn) endPendingLists(all bool) (found bool) {
+func (uc *upstreamConn) endPendingLISTs(all bool) (found bool) {
         found = false
         for i := 0; i < len(uc.user.pendingLISTs); i++ {
@@ -221 +221 @@
                         delete(uc.pendingLISTDownstreamSet, pl.downstreamID)
                         uc.user.forEachUpstream(func(uc *upstreamConn) {
-                                uc.trySendList(pl.downstreamID)
+                                uc.trySendLIST(pl.downstreamID)
                         })
                         return
@@ -229 +229 @@
 }
 
-func (uc *upstreamConn) trySendList(downstreamID uint64) {
+func (uc *upstreamConn) trySendLIST(downstreamID uint64) {
         // must be called with a lock in uc.user.pendingLISTsLock
 
@@ -959 +959 @@
                 }
 
-                pl := uc.getPendingList()
+                pl := uc.getPendingLIST()
                 if pl == nil {
                         return fmt.Errorf("unexpected RPL_LIST: no matching pending LIST")
@@ -972 +972 @@
                 })
         case irc.RPL_LISTEND:
-                ok := uc.endPendingLists(false)
+                ok := uc.endPendingLISTs(false)
                 if !ok {
                         return fmt.Errorf("unexpected RPL_LISTEND: no matching pending LIST")
@@ -1246 +1246 @@
 
                 if command == "LIST" {
-                        ok := uc.endPendingLists(false)
+                        ok := uc.endPendingLISTs(false)
                         if !ok {
                                 return fmt.Errorf("unexpected response for LIST: %q: no matching pending LIST", msg.Command)

trunk/user.go

@@ -173 +173 @@
                                 log.file.Close()
                         }
-                        uc.endPendingLists(true)
+                        uc.endPendingLISTs(true)
                 case eventUpstreamMessage:
                         msg, uc := e.msg, e.uc