[svn] Rewrite parsing and handling of URLs.

[wget] / src / wget.h

diff --git a/src/wget.h b/src/wget.h
index 02321777e16fd1e4eedfc1618cbcacb0b78b5c74..f5eff47e4f46e2d37e0db28c68902fb7d24851c6 100644 (file)
--- a/src/wget.h
+++ b/src/wget.h
@@ -231,24 +231,24 @@ char *xstrdup_debug PARAMS ((const char *, const char *, int));
 {                                                                              \
   /* Avoid side-effectualness.  */                                             \
   long do_realloc_needed_size = (needed_size);                                 \
-  long do_realloc_newsize = 0;                                                 \
-  while ((sizevar) < (do_realloc_needed_size)) {                               \
-    do_realloc_newsize = 2*(sizevar);                                          \
+  long do_realloc_newsize = (sizevar);                                         \
+  while (do_realloc_newsize < do_realloc_needed_size) {                                \
+    do_realloc_newsize <<= 1;                                                  \
     if (do_realloc_newsize < 16)                                               \
       do_realloc_newsize = 16;                                                 \
-    (sizevar) = do_realloc_newsize;                                            \
   }                                                                            \
-  if (do_realloc_newsize)                                                      \
+  if (do_realloc_newsize != (sizevar))                                         \
     {                                                                          \
       if (!allocap)                                                            \
        XREALLOC_ARRAY (basevar, type, do_realloc_newsize);                     \
       else                                                                     \
        {                                                                       \
          void *drfa_new_basevar = xmalloc (do_realloc_newsize);                \
-         memcpy (drfa_new_basevar, basevar, sizevar);                          \
+         memcpy (drfa_new_basevar, basevar, (sizevar));                        \
          (basevar) = drfa_new_basevar;                                         \
          allocap = 0;                                                          \
        }                                                                       \
+      (sizevar) = do_realloc_newsize;                                          \
     }                                                                          \
 } while (0)
 
@@ -285,9 +285,8 @@ typedef enum
   BINDERR, BINDOK, LISTENERR, ACCEPTERR, ACCEPTOK,
   CONCLOSED, FTPOK, FTPLOGINC, FTPLOGREFUSED, FTPPORTERR,
   FTPNSFOD, FTPRETROK, FTPUNKNOWNTYPE, FTPRERR,
-  FTPREXC, FTPSRVERR, FTPRETRINT, FTPRESTFAIL, URLHTTPS,
-  URLOK, URLHTTP, URLFTP, URLFILE, URLUNKNOWN, URLBADPORT,
-  URLBADHOST, FOPENERR, FWRITEERR, HOK, HLEXC, HEOF,
+  FTPREXC, FTPSRVERR, FTPRETRINT, FTPRESTFAIL, URLERROR,
+  FOPENERR, FWRITEERR, HOK, HLEXC, HEOF,
   HERR, RETROK, RECLEVELEXC, FTPACCDENIED, WRONGCODE,
   FTPINVPASV, FTPNOPASV,
   CONTNOTSUPPORTED, RETRUNNEEDED, RETRFINISHED, READERR, TRYLIMEXC,