[svn] Simplify indentation in sleep_between_retrievals.

diff --git a/src/ChangeLog b/src/ChangeLog
index 974ba611965eaf13b32881a44adb681c522735a9..e5dc98bcc128813266c8f90535603a339ada4855 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-17  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * retr.c (sleep_between_retrievals): Simplify indentation.
+
 2001-12-17  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * gen_sslfunc.c (ssl_init_prng): Use random_number to get a byte

diff --git a/src/retr.c b/src/retr.c
index 6bd885894c429a0ce7f86897541ba51d1701ed42..dabb407e971257a69acb48d0351667655145a67a 100644 (file)
--- a/src/retr.c
+++ b/src/retr.c
@@ -653,38 +653,41 @@ sleep_between_retrievals (int count)
 {
   static int first_retrieval = 1;
 
-  if (!first_retrieval && (opt.wait || opt.waitretry))
+  if (first_retrieval)
     {
-      if (opt.waitretry && count > 1)
-       {
-         /* If opt.waitretry is specified and this is a retry, wait
-            for COUNT-1 number of seconds, or for opt.waitretry
-            seconds.  */
-         if (count <= opt.waitretry)
-           sleep (count - 1);
-         else
-           sleep (opt.waitretry);
-       }
-      else if (opt.wait)
+      /* Don't sleep before the very first retrieval. */
+      first_retrieval = 0;
+      return;
+    }
+
+  if (opt.waitretry && count > 1)
+    {
+      /* If opt.waitretry is specified and this is a retry, wait for
+        COUNT-1 number of seconds, or for opt.waitretry seconds.  */
+      if (count <= opt.waitretry)
+       sleep (count - 1);
+      else
+       sleep (opt.waitretry);
+    }
+  else if (opt.wait)
+    {
+      if (!opt.random_wait || count > 1)
+       /* If random-wait is not specified, or if we are sleeping
+          between retries of the same download, sleep the fixed
+          interval.  */
+       sleep (opt.wait);
+      else
        {
-         /* Otherwise, check if opt.wait is specified.  If so, sleep.  */
-         if (count > 1 || !opt.random_wait)
-           sleep (opt.wait);
-         else
-           {
-             /* Sleep a random amount of time averaging in opt.wait
-                seconds.  The sleeping amount ranges from 0 to
-                opt.wait*2, inclusive.  */
-             int waitsecs = random_number (opt.wait * 2 + 1);
+         /* Sleep a random amount of time averaging in opt.wait
+            seconds.  The sleeping amount ranges from 0 to
+            opt.wait*2, inclusive.  */
+         int waitsecs = random_number (opt.wait * 2 + 1);
 
-             DEBUGP (("sleep_between_retrievals: norm=%ld,fuzz=%ld,sleep=%d\n",
-                      opt.wait, waitsecs - opt.wait, waitsecs));
+         DEBUGP (("sleep_between_retrievals: norm=%ld,fuzz=%ld,sleep=%d\n",
+                  opt.wait, waitsecs - opt.wait, waitsecs));
 
-             if (waitsecs)
-               sleep (waitsecs);
-           }
+         if (waitsecs)
+           sleep (waitsecs);
        }
     }
-  if (first_retrieval)
-    first_retrieval = 0;
 }