[svn] Get rid of ssl_iread/ssl_iwrite. Have the SSL code register its

[wget] / src / retr.c

diff --git a/src/retr.c b/src/retr.c
index 637f9316f618a9ab04f6bb7122a7ec2f1133abe7..db8b1c18174fda2a39b5c08ef07fc7a276c7039a 100644 (file)
--- a/src/retr.c
+++ b/src/retr.c
@@ -114,7 +114,7 @@ limit_bandwidth (long bytes, double *dltime, struct wget_timer *timer)
               slp, limit_data.chunk_bytes, limit_data.sleep_adjust));
 
       t0 = *dltime;
-      usleep ((unsigned long) (1000 * slp));
+      xsleep (slp / 1000);
       t1 = wtimer_elapsed (timer);
 
       /* Due to scheduling, we probably slept slightly longer (or
@@ -213,12 +213,7 @@ get_contents (int fd, FILE *fp, long *len, long restval, long expected,
     {
       int amount_to_read = (use_expected
                            ? MIN (expected - *len, dlbufsize) : dlbufsize);
-#ifdef HAVE_SSL
-      if (rbuf->ssl!=NULL)
-       res = ssl_iread (rbuf->ssl, dlbuf, amount_to_read);
-      else
-#endif /* HAVE_SSL */
-       res = iread (fd, dlbuf, amount_to_read);
+      res = xread (fd, dlbuf, amount_to_read, -1);
 
       if (res <= 0)
        break;
@@ -642,9 +637,9 @@ sleep_between_retrievals (int count)
       /* 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);
+       xsleep (count - 1);
       else
-       usleep (1000000L * opt.waitretry);
+       xsleep (opt.waitretry);
     }
   else if (opt.wait)
     {
@@ -652,7 +647,7 @@ sleep_between_retrievals (int count)
        /* If random-wait is not specified, or if we are sleeping
           between retries of the same download, sleep the fixed
           interval.  */
-       usleep (1000000L * opt.wait);
+       xsleep (opt.wait);
       else
        {
          /* Sleep a random amount of time averaging in opt.wait
@@ -661,7 +656,7 @@ sleep_between_retrievals (int count)
          double waitsecs = 2 * opt.wait * random_float ();
          DEBUGP (("sleep_between_retrievals: avg=%f,sleep=%f\n",
                   opt.wait, waitsecs));
-         usleep (1000000L * waitsecs);
+         xsleep (waitsecs);
        }
     }
 }