Move cleanup related code to `cleanup'

diff --git a/src/ChangeLog b/src/ChangeLog
index bd5945224ec2f12489d2b3d631e174c608d8fcee..b3937051cbbd22915d413de98fd55eb4a816378e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2012-06-16  Giuseppe Scrivano  <gscrivano@gnu.org>
 
+       * main.c (main): Move some cleanup related function to...
+       * init.c (cleanup): ...here.
+
        * main.c: Do not include "stdout.h".
        (main): Do not register `close_stdout' at exit.
        Reported by: Micah Cowan  <micah@cowan.name>.

diff --git a/src/init.c b/src/init.c
index d5f9a4f09bdb9c0d447a59b0333df96a59555915..40b62b2715c44882603c004c0cb54e9222d55feb 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -1675,6 +1675,12 @@ cleanup (void)
 {
   /* Free external resources, close files, etc. */
 
+  /* Close WARC file. */
+  if (opt.warc_filename != 0)
+    warc_close ();
+
+  log_close ();
+
   if (output_stream)
     fclose (output_stream);
   /* No need to check for error because Wget flushes its output (and
@@ -1696,6 +1702,9 @@ cleanup (void)
   host_cleanup ();
   log_cleanup ();
 
+  for (i = 0; i < nurl; i++)
+    xfree (url[i]);
+
   {
     extern acc_t *netrc_list;
     free_netrc (netrc_list);

diff --git a/src/main.c b/src/main.c
index 291fe0774bf5161ad457050cc1442c5a3bc38d3d..96d7d57f3227ace5cb76a909db32e9be917c7e64 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1626,14 +1626,6 @@ outputting to a regular file.\n"));
   if (opt.convert_links && !opt.delete_after)
     convert_all_links ();
 
-  /* Close WARC file. */
-  if (opt.warc_filename != 0)
-    warc_close ();
-
-  log_close ();
-
-  for (i = 0; i < nurl; i++)
-    xfree (url[i]);
   cleanup ();
 
   exit (get_exit_status ());