[svn] Various small fixes, courtesy of Gisle Vanem <giva@bgnett.no>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4eb61f4a12f138b67a0eadbd117420fc29841327..4ea647a4b0e878c10fce0fc1b07508fa18539e86 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2007-08-27  Gisle Vanem         <giva@bgnett.no>
+
+       * mswindows.c (run_with_timeout): Ensure that the correct
+       conversion specification is used for the return result of
+       the GetLastError function.
+       * getopt.c: Fix missing (but, accidentally, legal) comment
+       delimiter after licensing text.
+       * recur.c (retrieve_tree): Inserted missing cast for strip_auth.
+       * openssl.c (ssl_init): const-ified the meth local variable.
+
 2007-08-27  Micah Cowan  <micah@cowan.name>
 
        * wget.h: Added macro replacement for ngettext, for environs

diff --git a/src/getopt.c b/src/getopt.c
index be0acb2a6ba79198d6e8e9350ac1d5ab1b03b1a5..8187176b69c6167d8c2e1071e9b98aff4444cc7e 100644 (file)
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 \f
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
    Ditto for AIX 3.2 and <stdlib.h>.  */

diff --git a/src/mswindows.c b/src/mswindows.c
index 67400c836cbdcdb51f087dbf939f95bd882965c0..7b310678567449d8f615065258a5084c7081d188 100644 (file)
--- a/src/mswindows.c
+++ b/src/mswindows.c
@@ -545,7 +545,8 @@ run_with_timeout (double seconds, void (*fun) (void *), void *arg)
                              &thread_arg, 0, &thread_id);
   if (!thread_hnd)
     {
-      DEBUGP (("CreateThread() failed; [0x%x]\n", GetLastError ()));
+      DEBUGP (("CreateThread() failed; [%#lx]\n",
+               (unsigned long) GetLastError ()));
       goto blocking_fallback;
     }
 

diff --git a/src/openssl.c b/src/openssl.c
index 71faa0c0b26cda27f61f2335ef56da61b2806a66..9a29ed650b57988b8d8af26066ec91b74f5da9e1 100644 (file)
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -158,7 +158,7 @@ key_type_to_ssl_type (enum keyfile_type type)
 bool
 ssl_init ()
 {
-  SSL_METHOD *meth;
+  const SSL_METHOD *meth;
 
   if (ssl_ctx)
     /* The SSL has already been initialized. */

diff --git a/src/recur.c b/src/recur.c
index a8fc71af5fd000ef22acc849dbb620f6f274dde2..9de774c44997664ab1da711b61ee79b8aa5517c1 100644 (file)
--- a/src/recur.c
+++ b/src/recur.c
@@ -325,7 +325,7 @@ retrieve_tree (const char *start_url)
               struct urlpos *child = children;
               struct url *url_parsed = url_parsed = url_parse (url, NULL);
               char *referer_url = url;
-              bool strip_auth = url_parsed->user;
+              bool strip_auth = (bool)url_parsed->user;
               assert (url_parsed != NULL);
 
               /* Strip auth info if present */