This is the 6th of some splitted native Windows patches grouped by functionality.
Native Windows port enhancements:
- C++ fixes for MS Visual C++ compatibility, See this old squid-dev thread about:
http://www.squid-cache.org/mail-archive/squid-dev/200211/0249.html
- Some casting and prototypes fixes
- some little DNS sources changes for a better build process using MS Visual Studio.
Regards
Guido
- ======================================================= Serassio Guido Via Albenga, 11/4 10134 - Torino - ITALY E-mail: [EMAIL PROTECTED] WWW: http://www.serassio.it
Index: src/HttpHdrCc.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/HttpHdrCc.cc,v
retrieving revision 1.3
diff -u -p -r1.3 HttpHdrCc.cc
--- src/HttpHdrCc.cc 22 Feb 2003 03:14:29 -0000 1.3
+++ src/HttpHdrCc.cc 8 Mar 2003 10:52:23 -0000
@@ -59,7 +59,8 @@ HttpHeaderFieldInfo *CcFieldsInfo = NULL
http_hdr_cc_type &operator++ (http_hdr_cc_type &aHeader)
{
- aHeader = (http_hdr_cc_type)(++(int)aHeader);
+ int tmp = (int)aHeader;
+ aHeader = (http_hdr_cc_type)(++tmp);
return aHeader;
}
Index: src/HttpHeader.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/HttpHeader.cc,v
retrieving revision 1.7
diff -u -p -r1.7 HttpHeader.cc
--- src/HttpHeader.cc 7 Mar 2003 03:13:25 -0000 1.7
+++ src/HttpHeader.cc 8 Mar 2003 10:52:23 -0000
@@ -141,7 +141,8 @@ static HttpHeaderFieldInfo *Headers = NU
http_hdr_type &operator++ (http_hdr_type &aHeader)
{
- aHeader = (http_hdr_type)(++(int)aHeader);
+ int tmp = (int)aHeader;
+ aHeader = (http_hdr_type)(++tmp);
return aHeader;
}
Index: src/HttpReply.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/HttpReply.cc,v
retrieving revision 1.8
diff -u -p -r1.8 HttpReply.cc
--- src/HttpReply.cc 7 Mar 2003 03:13:26 -0000 1.8
+++ src/HttpReply.cc 8 Mar 2003 10:52:24 -0000
@@ -53,7 +53,8 @@ static http_hdr_type Denied304HeadersArr
HttpMsgParseState &operator++ (HttpMsgParseState &aState)
{
- aState = (HttpMsgParseState)(++(int)aState);
+ int tmp = (int)aState;
+ aState = (HttpMsgParseState)(++tmp);
return aState;
}
Index: src/ICP.h
===================================================================
RCS file: /cvsroot/squid/squid3/src/ICP.h,v
retrieving revision 1.4
diff -u -p -r1.4 ICP.h
--- src/ICP.h 22 Feb 2003 03:14:30 -0000 1.4
+++ src/ICP.h 8 Mar 2003 10:52:24 -0000
@@ -65,7 +65,8 @@ struct _icp_common_t
inline icp_opcode & operator++ (icp_opcode & aCode)
{
- aCode = (icp_opcode) (++(int) aCode);
+ int tmp = (int) aCode;
+ aCode = (icp_opcode) (++tmp);
return aCode;
}
Index: src/client_db.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/client_db.cc,v
retrieving revision 1.2
diff -u -p -r1.2 client_db.cc
--- src/client_db.cc 22 Feb 2003 03:14:31 -0000 1.2
+++ src/client_db.cc 8 Mar 2003 10:52:24 -0000
@@ -201,7 +201,8 @@ clientdbCutoffDenied(struct in_addr addr
log_type &operator++ (log_type &aLogType)
{
- aLogType = (log_type)(++(int)aLogType);
+ int tmp = (int)aLogType;
+ aLogType = (log_type)(++tmp);
return aLogType;
}
Index: src/client_side_reply.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/client_side_reply.cc,v
retrieving revision 1.26
diff -u -p -r1.26 client_side_reply.cc
--- src/client_side_reply.cc 7 Mar 2003 03:13:27 -0000 1.26
+++ src/client_side_reply.cc 8 Mar 2003 10:52:25 -0000
@@ -247,7 +247,8 @@ clientReplyContext::operator new (size_t
void
clientReplyContext::operator delete (void *address)
{
- cbdataFree ((clientReplyContext *)address);
+ clientReplyContext * tmp = (clientReplyContext *)address;
+ cbdataFree (tmp);
}
Index: src/comm.h
===================================================================
RCS file: /cvsroot/squid/squid3/src/comm.h,v
retrieving revision 1.11
diff -u -p -r1.11 comm.h
--- src/comm.h 4 Mar 2003 03:14:41 -0000 1.11
+++ src/comm.h 8 Mar 2003 10:52:25 -0000
@@ -4,7 +4,7 @@
#include "StoreIOBuffer.h"
typedef void IOFCB(int fd, StoreIOBuffer recievedData, comm_err_t flag, int xerrno,
void *data);
-typedef void IOWCB(int fd, char *data, size_t len, comm_err_t flag, int xerrno, void
*data);
+typedef void IOWCB(int fd, char *buffer, size_t len, comm_err_t flag, int xerrno,
void *data);
/* fill sb with up to length data from fd */
extern void comm_fill_immediate(int fd, StoreIOBuffer sb, IOFCB *callback, void
*data);
Index: src/errorpage.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/errorpage.cc,v
retrieving revision 1.12
diff -u -p -r1.12 errorpage.cc
--- src/errorpage.cc 25 Feb 2003 03:13:50 -0000 1.12
+++ src/errorpage.cc 8 Mar 2003 10:52:26 -0000
@@ -109,7 +109,8 @@ static CWCB errorSendComplete;
err_type &operator++ (err_type &anErr)
{
- anErr = (err_type)(++(int)anErr);
+ int tmp = (int)anErr;
+ anErr = (err_type)(++tmp);
return anErr;
}
Index: src/forward.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/forward.cc,v
retrieving revision 1.16
diff -u -p -r1.16 forward.cc
--- src/forward.cc 3 Mar 2003 03:13:50 -0000 1.16
+++ src/forward.cc 8 Mar 2003 10:52:26 -0000
@@ -553,7 +553,7 @@ fwdConnectStart(void *data)
outgoing = getOutgoingAddr(fwdState->request);
- tos = getOutgoingTOS(fwdState->request);
+ tos = (unsigned short) getOutgoingTOS(fwdState->request);
debug(17, 3) ("fwdConnectStart: got addr %s, tos %d\n",
inet_ntoa(outgoing), tos);
@@ -563,7 +563,7 @@ fwdConnectStart(void *data)
outgoing,
0,
COMM_NONBLOCKING,
- tos,
+ (unsigned char) tos,
url);
if (fd < 0) {
Index: src/mem.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/mem.cc,v
retrieving revision 1.11
diff -u -p -r1.11 mem.cc
--- src/mem.cc 7 Mar 2003 03:13:28 -0000 1.11
+++ src/mem.cc 8 Mar 2003 10:52:26 -0000
@@ -430,7 +430,8 @@ Mem::Init(void)
mem_type &operator++ (mem_type &aMem)
{
- aMem = (mem_type)(++(int)aMem);
+ int tmp = (int)aMem;
+ aMem = (mem_type)(++tmp);
return aMem;
}
Index: src/tunnel.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/tunnel.cc,v
retrieving revision 1.6
diff -u -p -r1.6 tunnel.cc
--- src/tunnel.cc 4 Mar 2003 03:14:47 -0000 1.6
+++ src/tunnel.cc 8 Mar 2003 10:52:26 -0000
@@ -584,7 +584,7 @@ sslStart(clientHttpRequest * http, size_
getOutgoingAddr(request),
0,
COMM_NONBLOCKING,
- getOutgoingTOS(request),
+ (unsigned char) getOutgoingTOS(request),
url);
if (sock == COMM_ERROR) {
Index: src/url.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/url.cc,v
retrieving revision 1.6
diff -u -p -r1.6 url.cc
--- src/url.cc 22 Feb 2003 03:14:36 -0000 1.6
+++ src/url.cc 8 Mar 2003 10:52:31 -0000
@@ -184,7 +184,8 @@ urlInitialize(void)
method_t &operator++ (method_t &aMethod)
{
- aMethod = (method_t)(++(int)aMethod);
+ int tmp = (int)aMethod;
+ aMethod = (method_t)(++tmp);
return aMethod;
}
Index: src/urn.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/urn.cc,v
retrieving revision 1.8
diff -u -p -r1.8 urn.cc
--- src/urn.cc 7 Mar 2003 03:13:29 -0000 1.8
+++ src/urn.cc 8 Mar 2003 10:52:31 -0000
@@ -114,7 +114,8 @@ UrnState::operator new (size_t byteCount
void
UrnState::operator delete (void *address)
{
- cbdataFree ((UrnState *)address);
+ UrnState * tmp = (UrnState *)address;
+ cbdataFree (tmp);
}
UrnState::~UrnState ()
Index: dns.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/dns.cc,v
retrieving revision 1.5
diff -u -p -r1.5 dns.cc
--- dns.cc 22 Feb 2003 03:14:33 -0000 1.5
+++ dns.cc 8 Mar 2003 11:06:09 -0000
@@ -36,6 +36,11 @@
#include "squid.h"
#include "Store.h"
+/* MS VisualStudio Projects are monolitich, so we need the following
+ #if to include the external DNS code in compile process when
+ using external DNS.
+ */
+#if USE_DNSSERVERS
static helper *dnsservers = NULL;
static void
@@ -167,3 +172,4 @@ snmp_netDnsFn(variable_list * Var, snint
}
#endif /*SQUID_SNMP */
+#endif /* USE_DNSSERVERS */
Index: dns_internal.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/dns_internal.cc,v
retrieving revision 1.9
diff -u -p -r1.9 dns_internal.cc
--- dns_internal.cc 3 Mar 2003 03:13:50 -0000 1.9
+++ dns_internal.cc 8 Mar 2003 11:06:09 -0000
@@ -37,6 +37,11 @@
#include "Store.h"
#include "comm.h"
+/* MS VisualStudio Projects are monolitich, so we need the following
+ #ifndef to exclude the internal DNS code from compile process when
+ using external DNS process.
+ */
+#ifndef USE_DNSSERVERS
#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
#include <windows.h>
#endif
@@ -91,7 +96,9 @@ static OBJH idnsStats;
static void idnsAddNameserver(const char *buf);
static void idnsFreeNameservers(void);
static void idnsParseNameservers(void);
+#ifndef _SQUID_MSWIN_
static void idnsParseResolvConf(void);
+#endif
#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
static void idnsParseWIN32Registry(void);
#endif
@@ -167,6 +174,7 @@ idnsParseNameservers(void)
}
}
+#ifndef _SQUID_MSWIN_
static void
idnsParseResolvConf(void)
{
@@ -180,7 +188,7 @@ idnsParseResolvConf(void)
return;
}
-#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
+#if defined(_SQUID_CYGWIN_)
setmode(fileno(fp), O_TEXT);
#endif
@@ -207,6 +215,8 @@ idnsParseResolvConf(void)
fclose(fp);
}
+#endif
+
#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
static void
idnsParseWIN32Registry(void)
@@ -917,3 +927,4 @@ snmp_netIdnsFn(variable_list * Var, snin
}
#endif /*SQUID_SNMP */
+#endif /* USE_DNSSERVERS */
