Re: [Bug-wget] Broken 'DEBUG_MALLOC' code

[Gisle Vanem]

"Tim Ruehsen" <tim.rueh...@gmx.de> wrote:

init.c:1738:12: error: 'url' undeclared (first use in this function)
    xfree (url[i]);

Thatnks for pointing this out.
Are you going to create a patch ?

Attached are my diffs.

--gv
diff --git a/src/init.c b/src/init.c
index 84ae654..9ff374b 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1700,8 +1700,11 @@ void spider_cleanup (void);

/* Free the memory allocated by global variables.  */
void
-cleanup (void)
+cleanup (int num_urls, char ***url_list)
{
+  int i;
+  char **url = *url_list;
+
  /* Free external resources, close files, etc. */

  /* Close WARC file. */
@@ -1734,8 +1737,8 @@ cleanup (void)
  host_cleanup ();
  log_cleanup ();

-  for (i = 0; i < nurl; i++)
-    xfree (url[i]);
+  for (i = 0; i < num_urls; i++)
+     xfree (url[i]);

  {
    extern acc_t *netrc_list;

diff --git a/src/init.h b/src/init.h
index 21ebee5..ab75205 100644
--- a/src/init.h
+++ b/src/init.h
@@ -39,7 +39,7 @@ void initialize (void);
void run_command (const char *);
void setoptval (const char *, const char *, const char *);
char *home_dir (void);
-void cleanup (void);
+void cleanup (int num_urls, char ***url_list);
void defaults (void);
bool run_wgetrc (const char *file);

diff --git a/src/main.c b/src/main.c
index 19d7253..7168239 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1701,7 +1701,7 @@ outputting to a regular file.\n"));
  if (opt.convert_links && !opt.delete_after)
    convert_all_links ();

-  cleanup ();
+  cleanup (nurl, &url);

  exit (get_exit_status ());
}