Syntactic restructuring of commSetTimeout to make the function more

obvious, oblivating the need of a comment explaining what it going on.

diff --git a/src/comm.cc b/src/comm.cc
index 7f71414035e4a9c599739083ca9823507db965a2..74337c1e552b12225558e9316becd4fa2e8e9b89 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.330 2002/04/18 16:09:37 hno Exp $
+ * $Id: comm.cc,v 1.331 2002/04/19 06:26:26 hno Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -442,18 +442,15 @@ commSetTimeout(int fd, int timeout, PF * handler, void *data)
        cbdataReferenceDone(F->timeout_data);
        F->timeout_handler = NULL;
        F->timeout = 0;
-       return F->timeout;
-    }
-    assert(handler || F->timeout_handler);
-    if (handler || data) {
-       /* new timeout handler installed. If NULL then the timeout
-        * is only extended
-        */
-       cbdataReferenceDone(F->timeout_data);
-       F->timeout_handler = handler;
-       F->timeout_data = cbdataReference(data);
+    } else {
+       assert(handler || F->timeout_handler);
+       if (handler) {
+           cbdataReferenceDone(F->timeout_data);
+           F->timeout_handler = handler;
+           F->timeout_data = cbdataReference(data);
+       }
+       F->timeout = squid_curtime + (time_t) timeout;
     }
-    F->timeout = squid_curtime + (time_t) timeout;
     return F->timeout;
 }