[svn] Check for do_realloc_newsize in loop condition because we're no longer

setting SIZEVAR here.

diff --git a/src/ChangeLog b/src/ChangeLog
index 44d44f681a19e09cc4ff9ba7453f93c66f11a7d4..de743a8f5f9aad92e8f671841193c366bcb74e0c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,7 @@
-2001-06-18  Hrvoje Niksic  <hniksic@arsdigita.com>
+2001-06-26  Hrvoje Niksic  <hniksic@arsdigita.com>
 
-       * recur.c (convert_all_links): Make sure "../" stuff is properly
-       handled in cur_url->url before we hand it over to convert_links.
-       (register_download): Canonicalize URL before storing it.
+       * wget.h (DO_REALLOC_FROM_ALLOCA): Check for do_realloc_newsize in
+       loop condition because we're no longer setting SIZEVAR here.
 
 2001-06-26  Hrvoje Niksic  <hniksic@arsdigita.com>
 

diff --git a/src/wget.h b/src/wget.h
index fb7e3f49759fe7c3e9e1138705b180b16566ec94..3837d9b42cbb6f33dd4d75a046a2f279622e4af6 100644 (file)
--- a/src/wget.h
+++ b/src/wget.h
@@ -231,20 +231,20 @@ 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;                                                 \
   }                                                                            \
-  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;                                                          \
        }                                                                       \