From 248cb3e907818ba890eae6fbece663e6e41def7b Mon Sep 17 00:00:00 2001 From: micah Date: Mon, 27 Aug 2007 10:48:16 -0700 Subject: [PATCH] [svn] Various small fixes, courtesy of Gisle Vanem . --- src/ChangeLog | 10 ++++++++++ src/getopt.c | 2 +- src/mswindows.c | 3 ++- src/openssl.c | 2 +- src/recur.c | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4eb61f4a..4ea647a4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2007-08-27 Gisle Vanem + + * 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 * wget.h: Added macro replacement for ngettext, for environs diff --git a/src/getopt.c b/src/getopt.c index be0acb2a..8187176b 100644 --- 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 . + along with this program. If not, see . */ /* This tells Alpha OSF/1 not to define a getopt prototype in . Ditto for AIX 3.2 and . */ diff --git a/src/mswindows.c b/src/mswindows.c index 67400c83..7b310678 100644 --- 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 71faa0c0..9a29ed65 100644 --- 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 a8fc71af..9de774c4 100644 --- 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 */ -- 2.39.2