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

diff --git a/src/ChangeLog b/src/ChangeLog
index ee370c365230d3ea97f679175ab4627b269c870e..765585344f105bf72df6feb2bacc8cd392347c5e 100644 (file)
--- 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 8df7a36124b6b9f07cb3babcead8af160d58d136..42389839181433fb1cacbaacf644509c972ae436 100644 (file)
--- 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 de031cb0117c2aeae3ea7909e4790ad0acb3a58c..1bf8df93d31940990c72d586bf2cdf0752a37e57 100644 (file)
--- 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 da0665d08d02a8b83a1934f7bc62124ca20f027e..d339bb32e036f456c0dc7b8b82298b06fd834d21 100644 (file)
--- 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 */