[svn] Remove --wait/--waitretry compatibility code.

Published in <sxs6686py1q.fsf@florida.arsdigita.de>.

diff --git a/src/ChangeLog b/src/ChangeLog
index f375f50f4f3db1225edc0513a89d6b7d419a4ce2..1a0457b0337b8ba7bda5e8a98030670fcdfaac97 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-19  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * main.c: Remove --wait / --waitretry backwards compatibility
+       code.
+       
 2001-11-19  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * main.c (main): Use it.

diff --git a/src/main.c b/src/main.c
index 092a455f1d23452b9e341ef70bfe1579d7548b8b..833abf939d6abdfb2912bfcd6116b8a46ca292bb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -243,7 +243,6 @@ main (int argc, char *const *argv)
 {
   char **url, **t;
   int i, c, nurl, status, append_to_log;
-  int wr = 0;
 
   static struct option long_options[] =
   {
@@ -518,7 +517,6 @@ GNU General Public License for more details.\n"));
          break;
        case 152:
          setval ("waitretry", optarg);
-         wr = 1;
          break;
        case 153:
          setval ("followtags", optarg);
@@ -693,18 +691,6 @@ GNU General Public License for more details.\n"));
   if (opt.verbose == -1)
     opt.verbose = !opt.quiet;
 
-  /* Retain compatibility with previous scripts.
-     if wait has been set, but waitretry has not, give it the wait value.
-     A simple check on the values is not enough, I could have set
-     wait to n>0 and waitretry to 0 - HEH */
-  if (opt.wait && !wr)
-    {
-      char  opt_wait_str[256];  /* bigger than needed buf to prevent overflow */
-
-      sprintf(opt_wait_str, "%ld", opt.wait);
-      setval ("waitretry", opt_wait_str);
-    }
-    
   /* Sanity checks.  */
   if (opt.verbose && opt.quiet)
     {