From: Micah Cowan <micah@cowan.name>
Date: Thu, 11 Oct 2007 04:03:07 +0000 (-0700)
Subject: Merged with eleven for Gisle's mswindows.c patch.
X-Git-Tag: v1.13~516
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=61533a5ebcb778a2a0b574b862ea8a10395c053d;hp=b8f07eab3b3e65c7b759d76463392780a512c993

Merged with eleven for Gisle's mswindows.c patch.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ee370c36..76558534 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-09  Gisle Vanem  <gvanem@broadpark.no>
+
+	* mswindows.c: 'argc' and 'argv' in 'windows_main()' are no longer
+	needed.  Hence simply the prototype. Free 'exec_name' at exit.
+
 2007-10-09  Micah Cowan  <micah@cowan.name>
 
 	* gettext.h: Imported from /usr/share/gettext, fuller handling
diff --git a/src/main.c b/src/main.c
index 8df7a361..42389839 100644
--- a/src/main.c
+++ b/src/main.c
@@ -708,7 +708,7 @@ main (int argc, char *const *argv)
 
 #ifdef WINDOWS
   /* Drop extension (typically .EXE) from executable filename. */
-  windows_main (&argc, (char **) argv, (char **) &exec_name);
+  windows_main ((char **) &exec_name);
 #endif
 
   /* Set option defaults; read the system wgetrc and ~/.wgetrc.  */
diff --git a/src/mswindows.c b/src/mswindows.c
index de031cb0..1bf8df93 100644
--- a/src/mswindows.c
+++ b/src/mswindows.c
@@ -73,7 +73,7 @@ xsleep (double seconds)
 }
 
 void
-windows_main (int *argc, char **argv, char **exec_name)
+windows_main (char **exec_name)
 {
   char *p;
 
@@ -87,6 +87,7 @@ windows_main (int *argc, char **argv, char **exec_name)
 static void
 ws_cleanup (void)
 {
+  xfree ((char*)exec_name);
   WSACleanup ();
 }
 
diff --git a/src/mswindows.h b/src/mswindows.h
index da0665d0..d339bb32 100644
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -208,6 +208,6 @@ void ws_startup (void);
 void ws_changetitle (const char *);
 void ws_percenttitle (double);
 char *ws_mypath (void);
-void windows_main (int *, char **, char **);
+void windows_main (char **);
 
 #endif /* MSWINDOWS_H */