Refactored a few for EndPointListener.cs

sta · sta · commit e5df79514f1d · 2015-01-03T16:18:35.000+09:00
diff --git a/websocket-sharp/Net/EndPointListener.cs b/websocket-sharp/Net/EndPointListener.cs
@@ -373,7 +373,7 @@ internal void RemoveConnection (HttpConnection connection)
 
     #region Public Methods
 
-    public void AddPrefix (HttpListenerPrefix prefix, HttpListener httpListener)
+    public void AddPrefix (HttpListenerPrefix prefix, HttpListener listener)
     {
       List<HttpListenerPrefix> current, future;
       if (prefix.Host == "*") {
@@ -383,7 +383,7 @@ public void AddPrefix (HttpListenerPrefix prefix, HttpListener httpListener)
                    ? new List<HttpListenerPrefix> (current)
                    : new List<HttpListenerPrefix> ();
 
-          prefix.Listener = httpListener;
+          prefix.Listener = listener;
           addSpecial (future, prefix);
         }
         while (Interlocked.CompareExchange (ref _unhandled, future, current) != current);
@@ -398,7 +398,7 @@ public void AddPrefix (HttpListenerPrefix prefix, HttpListener httpListener)
                    ? new List<HttpListenerPrefix> (current)
                    : new List<HttpListenerPrefix> ();
 
-          prefix.Listener = httpListener;
+          prefix.Listener = listener;
           addSpecial (future, prefix);
         }
         while (Interlocked.CompareExchange (ref _all, future, current) != current);
@@ -411,15 +411,15 @@ public void AddPrefix (HttpListenerPrefix prefix, HttpListener httpListener)
         prefs = _prefixes;
         if (prefs.ContainsKey (prefix)) {
           var other = prefs[prefix];
-          if (other != httpListener)
+          if (other != listener)
             throw new HttpListenerException (
               400, String.Format ("There's another listener for {0}.", prefix)); // TODO: Code?
 
           return;
         }
 
         prefs2 = new Dictionary<HttpListenerPrefix, HttpListener> (prefs);
-        prefs2[prefix] = httpListener;
+        prefs2[prefix] = listener;
       }
       while (Interlocked.CompareExchange (ref _prefixes, prefs2, prefs) != prefs);
     }
@@ -451,7 +451,7 @@ public void Close ()
       }
     }
 
-    public void RemovePrefix (HttpListenerPrefix prefix, HttpListener httpListener)
+    public void RemovePrefix (HttpListenerPrefix prefix, HttpListener listener)
     {
       List<HttpListenerPrefix> current, future;
       if (prefix.Host == "*") {

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ internal void RemoveConnection (HttpConnection connection)`
`373`	`373`
`374`	`374`	`#region Public Methods`
`375`	`375`
`376`		`- public void AddPrefix (HttpListenerPrefix prefix, HttpListener httpListener)`
	`376`	`+ public void AddPrefix (HttpListenerPrefix prefix, HttpListener listener)`
`377`	`377`	`{`
`378`	`378`	`List<HttpListenerPrefix> current, future;`
`379`	`379`	`if (prefix.Host == "*") {`
`@@ -383,7 +383,7 @@ public void AddPrefix (HttpListenerPrefix prefix, HttpListener httpListener)`
`383`	`383`	`? new List<HttpListenerPrefix> (current)`
`384`	`384`	`: new List<HttpListenerPrefix> ();`
`385`	`385`
`386`		`- prefix.Listener = httpListener;`
	`386`	`+ prefix.Listener = listener;`
`387`	`387`	`addSpecial (future, prefix);`
`388`	`388`	`}`
`389`	`389`	`while (Interlocked.CompareExchange (ref _unhandled, future, current) != current);`
`@@ -398,7 +398,7 @@ public void AddPrefix (HttpListenerPrefix prefix, HttpListener httpListener)`
`398`	`398`	`? new List<HttpListenerPrefix> (current)`
`399`	`399`	`: new List<HttpListenerPrefix> ();`
`400`	`400`
`401`		`- prefix.Listener = httpListener;`
	`401`	`+ prefix.Listener = listener;`
`402`	`402`	`addSpecial (future, prefix);`
`403`	`403`	`}`
`404`	`404`	`while (Interlocked.CompareExchange (ref _all, future, current) != current);`
`@@ -411,15 +411,15 @@ public void AddPrefix (HttpListenerPrefix prefix, HttpListener httpListener)`
`411`	`411`	`prefs = _prefixes;`
`412`	`412`	`if (prefs.ContainsKey (prefix)) {`
`413`	`413`	`var other = prefs[prefix];`
`414`		`- if (other != httpListener)`
	`414`	`+ if (other != listener)`
`415`	`415`	`throw new HttpListenerException (`
`416`	`416`	`400, String.Format ("There's another listener for {0}.", prefix)); // TODO: Code?`
`417`	`417`
`418`	`418`	`return;`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`prefs2 = new Dictionary<HttpListenerPrefix, HttpListener> (prefs);`
`422`		`- prefs2[prefix] = httpListener;`
	`422`	`+ prefs2[prefix] = listener;`
`423`	`423`	`}`
`424`	`424`	`while (Interlocked.CompareExchange (ref _prefixes, prefs2, prefs) != prefs);`
`425`	`425`	`}`
`@@ -451,7 +451,7 @@ public void Close ()`
`451`	`451`	`}`
`452`	`452`	`}`
`453`	`453`
`454`		`- public void RemovePrefix (HttpListenerPrefix prefix, HttpListener httpListener)`
	`454`	`+ public void RemovePrefix (HttpListenerPrefix prefix, HttpListener listener)`
`455`	`455`	`{`
`456`	`456`	`List<HttpListenerPrefix> current, future;`
`457`	`457`	`if (prefix.Host == "*") {`