From f08922082f48c90fb4a37d597e0a8e782cb5ba55 Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Mon, 24 Sep 2007 22:17:31 -0700 Subject: [PATCH 1/2] Apply patch to fix always reporting local size of zero. --- src/ChangeLog | 5 +++++ src/http.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5f598e62..17e39860 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-09-24 Jochen Roderburg + + * http.c (http_zero): Remove no-longer-used local_size variable. + Fixes bug #21057. + 2007-08-29 Micah Cowan * openssl.c (ssl_init): Re un-const-ified the meth local diff --git a/src/http.c b/src/http.c index 0e292918..6dd5158c 100644 --- a/src/http.c +++ b/src/http.c @@ -2311,7 +2311,6 @@ http_loop (struct url *u, char **newloc, char **local_file, const char *referer, const char *tmrate; uerr_t err, ret = TRYLIMEXC; time_t tmr = -1; /* remote time-stamp */ - wgint local_size = 0; /* the size of the local file */ struct http_stat hstat; /* HTTP status */ struct_stat st; bool send_head_first = true; @@ -2589,7 +2588,7 @@ Server file no newer than local file `%s' -- not retrieving.\n\n"), { logprintf (LOG_VERBOSE, _("\ The sizes do not match (local %s) -- retrieving.\n"), - number_to_static_string (local_size)); + number_to_static_string (hstat.orig_file_size)); } } else From ae1052a34f5c1a2d77d9b97cb1ed434eaba6cf96 Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Mon, 24 Sep 2007 23:28:10 -0700 Subject: [PATCH 2/2] Apply Christopher Lewis' patch re HAV_INTPTR_T --- windows/ChangeLog | 5 +++++ windows/config-compiler.h | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/windows/ChangeLog b/windows/ChangeLog index f2738e02..9ca9c8ce 100644 --- a/windows/ChangeLog +++ b/windows/ChangeLog @@ -1,3 +1,8 @@ +2007-09-24 Christopher Lewis + + * config-compiler.h: Fix compiler warnings related to + HAVE_INTPTR_T. + 2007-07-05 Micah Cowan * Makefile.top.bor, Makefile.doc, Makefile.in, Makefile.src: diff --git a/windows/config-compiler.h b/windows/config-compiler.h index fbd139be..acd752b4 100644 --- a/windows/config-compiler.h +++ b/windows/config-compiler.h @@ -86,7 +86,7 @@ so, delete this exception statement from your version. */ #define HAVE__BOOL 1 #undef SIZEOF_LONG_LONG /* avoid redefinition warning */ #define SIZEOF_LONG_LONG 8 -#define HAVE_INTPTR_T 1 +#define HAVE_INTPTR_T 1 #define HAVE_UINTPTR_T 1 #define HAVE_STRTOLL 1 @@ -119,10 +119,16 @@ so, delete this exception statement from your version. */ # define HAVE__STRTOI64 1 #endif +#if _MSC_VER >= 1310 +#define HAVE_INTPTR_T 1 +#define HAVE_UINTPTR_T 1 +#endif + #if _MSC_VER >= 1400 #pragma warning ( disable : 4996 ) #define _CRT_SECURE_NO_DEPRECATE #endif + #undef HAVE_UTIME_H /* no */