Fix some compile errors from Windows MinGW (#71)

MinGW compiler is a bit more limited than most GCC or Clang available.
The types used on Windows for some API declarations differ from those
commonly used on Linux/BSD systems.

TODO: There are additional compile issues to resolve.

diff --git a/compat/assert.h b/compat/assert.h
index 2907ae07f8bd636b499854d51a5ae52c46c7a9ea..7aa8625dc85330c40087ff75fd6fd96275f2734e 100644 (file)
--- a/compat/assert.h
+++ b/compat/assert.h
@@ -9,7 +9,9 @@
 #ifndef SQUID_ASSERT_H
 #define SQUID_ASSERT_H
 
-#if defined(NODEBUG)
+#if PURIFY
+#define assert(EX) ((void)0)
+#elif defined(NODEBUG)
 #define assert(EX) ((void)0)
 #elif STDC_HEADERS
 #define assert(EX)  ((EX)?((void)0):xassert( # EX , __FILE__, __LINE__))

diff --git a/lib/sspwin32.cc b/lib/sspwin32.cc
index 8bd15897ebbfd2902294c66f978398f7566cc459..1fb9d2922098a9c6572d1ba1f7d3eb3d1a247c6e 100644 (file)
--- a/lib/sspwin32.cc
+++ b/lib/sspwin32.cc
@@ -492,12 +492,12 @@ const char * WINAPI SSP_MakeChallenge(PVOID PNegotiateBuf, int NegotiateLen)
         struct base64_encode_ctx ctx;
         base64_encode_init(&ctx);
         static char encoded[8192];
-        size_t dstLen = base64_encode_update(&ctx, encoded, cbOut, fResult);
+        size_t dstLen = base64_encode_update(&ctx, encoded, cbOut, reinterpret_cast<const uint8_t*>(fResult));
         assert(dstLen < sizeof(encoded));
         dstLen += base64_encode_final(&ctx, encoded+dstLen);
         assert(dstLen < sizeof(encoded));
         encoded[dstLen] = '\0';
-        return reinterpret_cast<char *>(encoded);
+        return encoded;
     }
     return NULL;
 }
@@ -558,12 +558,12 @@ const char * WINAPI SSP_MakeNegotiateBlob(PVOID PNegotiateBuf, int NegotiateLen,
         struct base64_encode_ctx ctx;
         base64_encode_init(&ctx);
         static char encoded[8192];
-        size_t dstLen = base64_encode_update(&ctx, encoded, cbOut, pServerBuf);
+        size_t dstLen = base64_encode_update(&ctx, encoded, cbOut, reinterpret_cast<const uint8_t*>(pServerBuf));
         assert(dstLen < sizeof(encoded));
         dstLen += base64_encode_final(&ctx, encoded+dstLen);
         assert(dstLen < sizeof(encoded));
         encoded[dstLen] = '\0';
-        return reinterpret_cast<char *>(encoded);
+        return encoded;
     }
     return NULL;
 }
@@ -593,12 +593,12 @@ const char * WINAPI SSP_ValidateNegotiateCredentials(PVOID PAutenticateBuf, int
         struct base64_encode_ctx ctx;
         base64_encode_init(&ctx);
         static char encoded[8192];
-        size_t dstLen = base64_encode_update(&ctx, encoded, cbOut, pServerBuf);
+        size_t dstLen = base64_encode_update(&ctx, encoded, cbOut, reinterpret_cast<const uint8_t*>(pServerBuf));
         assert(dstLen < sizeof(encoded));
         dstLen += base64_encode_final(&ctx, encoded+dstLen);
         assert(dstLen < sizeof(encoded));
         encoded[dstLen] = '\0';
-        return reinterpret_cast<char *>(encoded);
+        return encoded;
     }
     return NULL;
 }

diff --git a/src/DiskIO/DiskThreads/aiops_win32.cc b/src/DiskIO/DiskThreads/aiops_win32.cc
index 06024ddb6d40c6a7384dfb590041e04d3fe25463..96a611ffe88b9138e9c8780b4f539ed3fcf22c00 100644 (file)
--- a/src/DiskIO/DiskThreads/aiops_win32.cc
+++ b/src/DiskIO/DiskThreads/aiops_win32.cc
@@ -279,7 +279,7 @@ squidaio_init(void)
     /* Create threads and get them to sit in their wait loop */
     squidaio_thread_pool = memPoolCreate("aio_thread", sizeof(squidaio_thread_t));
 
-    assert(NUMTHREADS);
+    assert(NUMTHREADS > 0);
 
     for (i = 0; i < NUMTHREADS; ++i) {
         threadp = (squidaio_thread_t *)squidaio_thread_pool->alloc();

diff --git a/src/anyp/Uri.cc b/src/anyp/Uri.cc
index e42f7c6c022b2c4dff0d5dc42d54b4e10186a6d0..d37782695e9c766a80dab28ddbeaf08eb814b9b9 100644 (file)
--- a/src/anyp/Uri.cc
+++ b/src/anyp/Uri.cc
@@ -718,7 +718,7 @@ urlMakeAbsolute(const HttpRequest * req, const char *relUrl)
 }
 
 int
-matchDomainName(const char *h, const char *d, uint8_t flags)
+matchDomainName(const char *h, const char *d, MatchDomainNameFlags flags)
 {
     int dl;
     int hl;

diff --git a/src/anyp/Uri.h b/src/anyp/Uri.h
index df0effc81fa4edf9007e524aa519d32094f9627c..37378c2bad24f543c3522360db383e1a74ed03dc 100644 (file)
--- a/src/anyp/Uri.h
+++ b/src/anyp/Uri.h
@@ -243,7 +243,7 @@ enum MatchDomainNameFlags {
  * \retval 1 means the host is greater than the domain
  * \retval -1 means the host is less than the domain
  */
-int matchDomainName(const char *host, const char *domain, uint8_t flags = mdnNone);
+int matchDomainName(const char *host, const char *domain, MatchDomainNameFlags flags = mdnNone);
 int urlCheckRequest(const HttpRequest *);
 char *urlHostname(const char *url);
 void urlExtMethodConfigure(void);

diff --git a/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc b/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc
index d73e3a8ee59d1a3c47d529c4ff91bc3206bd5179..0c2818b44ac6293ef3062ff4d9e290f563f80560 100644 (file)
--- a/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc
+++ b/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc
@@ -131,7 +131,7 @@ token_decode(size_t *decodedLen, uint8_t decoded[], const char *buf)
 {
     struct base64_decode_ctx ctx;
     base64_decode_init(&ctx);
-    if (!base64_decode_update(&ctx, decodedLen, decoded, strlen(buf), reinterpret_cast<const uint8_t*>(buf)) ||
+    if (!base64_decode_update(&ctx, decodedLen, decoded, strlen(buf), buf) ||
             !base64_decode_final(&ctx)) {
         SEND("BH base64 decode failed");
         fprintf(stderr, "ERROR: base64 decoding failed for: '%s'\n", buf);

diff --git a/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc b/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc
index f834145eb47f5ace836ef47102c0ce141b89feb4..74cf4a932dd54ebef79918976b600774aad70042 100644 (file)
--- a/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc
+++ b/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc
@@ -418,7 +418,7 @@ token_decode(size_t *decodedLen, uint8_t decoded[], const char *buf)
 {
     struct base64_decode_ctx ctx;
     base64_decode_init(&ctx);
-    if (!base64_decode_update(&ctx, decodedLen, decoded, strlen(buf), reinterpret_cast<const uint8_t*>(buf)) ||
+    if (!base64_decode_update(&ctx, decodedLen, decoded, strlen(buf), buf) ||
             !base64_decode_final(&ctx)) {
         SEND_BH("message=\"base64 decode failed\"");
         fprintf(stderr, "ERROR: base64 decoding failed for: '%s'\n", buf);

diff --git a/src/base/File.cc b/src/base/File.cc
index 649c79e2be7fdd7f420baa18f4887d5be9f3b564..705ac303214df815500b77e211f76e33994bba4a 100644 (file)
--- a/src/base/File.cc
+++ b/src/base/File.cc
@@ -173,7 +173,7 @@ File::open(const FileOpeningConfig &cfg)
     fd_ = CreateFile(TEXT(name_.c_str()), cfg.desiredAccess, cfg.shareMode, nullptr, cfg.creationDisposition, FILE_ATTRIBUTE_NORMAL, nullptr);
     if (fd_ == InvalidHandle) {
         const auto savedError = GetLastError();
-        throw TexcHere(sysCallFailure("CreateFile", WindowsErrorMessage(savedError).c_str()));
+        throw TexcHere(sysCallFailure("CreateFile", WindowsErrorMessage(savedError)));
     }
 #else
     mode_t oldCreationMask = 0;
@@ -199,7 +199,7 @@ File::close()
 #if _SQUID_WINDOWS_
     if (!CloseHandle(fd_)) {
         const auto savedError = GetLastError();
-        debugs(54, DBG_IMPORTANT, sysCallFailure("CloseHandle", WindowsErrorMessage(savedError).c_str()));
+        debugs(54, DBG_IMPORTANT, sysCallFailure("CloseHandle", WindowsErrorMessage(savedError)));
     }
 #else
     if (::close(fd_) != 0) {
@@ -216,12 +216,12 @@ File::truncate()
 #if _SQUID_WINDOWS_
     if (!SetFilePointer(fd_, 0, nullptr, FILE_BEGIN)) {
         const auto savedError = GetLastError();
-        throw TexcHere(sysCallFailure("SetFilePointer", WindowsErrorMessage(savedError).c_str()));
+        throw TexcHere(sysCallFailure("SetFilePointer", WindowsErrorMessage(savedError)));
     }
 
     if (!SetEndOfFile(fd_)) {
         const auto savedError = GetLastError();
-        throw TexcHere(sysCallFailure("SetEndOfFile", WindowsErrorMessage(savedError).c_str()));
+        throw TexcHere(sysCallFailure("SetEndOfFile", WindowsErrorMessage(savedError)));
     }
 #else
     if (::lseek(fd_, SEEK_SET, 0) < 0) {
@@ -246,7 +246,7 @@ File::readSmall(const SBuf::size_type minBytes, const SBuf::size_type maxBytes)
     DWORD result = 0;
     if (!ReadFile(fd_, rawBuf, readLimit, &result, nullptr)) {
         const auto savedError = GetLastError();
-        throw TexcHere(sysCallFailure("ReadFile", WindowsErrorMessage(savedError).c_str()));
+        throw TexcHere(sysCallFailure("ReadFile", WindowsErrorMessage(savedError)));
     }
 #else
     const auto result = ::read(fd_, rawBuf, readLimit);
@@ -261,12 +261,13 @@ File::readSmall(const SBuf::size_type minBytes, const SBuf::size_type maxBytes)
     buf.rawAppendFinish(rawBuf, bytesRead);
 
     if (buf.length() < minBytes) {
-        const auto failure = buf.length() ? "premature eof" : "empty file";
-        throw TexcHere(sysCallFailure("read", failure));
+        static const SBuf errPrematureEof("premature eof");
+        static const SBuf errEmptyFile("empty file");
+        throw TexcHere(sysCallFailure("read", buf.length() ? errPrematureEof : errEmptyFile));
     }
 
     if (buf.length() > maxBytes) {
-        const auto failure = "unreasonably large file";
+        static const SBuf failure("unreasonably large file");
         throw TexcHere(sysCallFailure("read", failure));
     }
 
@@ -281,7 +282,7 @@ File::writeAll(const SBuf &data)
     DWORD nBytesWritten = 0;
     if (!WriteFile(fd_, data.rawContent(), data.length(), &nBytesWritten, nullptr)) {
         const auto savedError = GetLastError();
-        throw TexcHere(sysCallFailure("WriteFile", WindowsErrorMessage(savedError).c_str()));
+        throw TexcHere(sysCallFailure("WriteFile", WindowsErrorMessage(savedError)));
     }
     const auto bytesWritten = static_cast<size_t>(nBytesWritten);
 #else
@@ -292,8 +293,10 @@ File::writeAll(const SBuf &data)
     }
     const auto bytesWritten = static_cast<size_t>(result);
 #endif
-    if (bytesWritten != data.length())
-        throw TexcHere(sysCallFailure("write", "partial write"));
+    if (bytesWritten != data.length()) {
+        static const SBuf failure("partial write");
+        throw TexcHere(sysCallFailure("write", failure));
+    }
 }
 
 void
@@ -302,7 +305,7 @@ File::synchronize()
 #if _SQUID_WINDOWS_
     if (!FlushFileBuffers(fd_)) {
         const auto savedError = GetLastError();
-        throw TexcHere(sysCallFailure("FlushFileBuffers", WindowsErrorMessage(savedError).c_str()));
+        throw TexcHere(sysCallFailure("FlushFileBuffers", WindowsErrorMessage(savedError)));
     }
 #else
     if (::fsync(fd_) != 0) {
@@ -340,7 +343,7 @@ File::lockOnce(const FileOpeningConfig &cfg)
 #if _SQUID_WINDOWS_
     if (!LockFileEx(fd_, cfg.lockFlags, 0, 0, 1, 0)) {
         const auto savedError = GetLastError();
-        throw TexcHere(sysCallFailure("LockFileEx", WindowsErrorMessage(savedError).c_str()));
+        throw TexcHere(sysCallFailure("LockFileEx", WindowsErrorMessage(savedError)));
     }
 #elif _SQUID_SOLARIS_
     if (fcntlLock(fd_, cfg.lockType) != 0) {
@@ -358,7 +361,7 @@ File::lockOnce(const FileOpeningConfig &cfg)
 
 /// \returns a description a system call-related failure
 SBuf
-File::sysCallFailure(const char *callName, const char *error) const
+File::sysCallFailure(const char *callName, const SBuf &error) const
 {
     return ToSBuf("failed to ", callName, ' ', name_, ": ", error);
 }
@@ -367,7 +370,7 @@ File::sysCallFailure(const char *callName, const char *error) const
 SBuf
 File::sysCallError(const char *callName, const int savedErrno) const
 {
-    return sysCallFailure(callName, xstrerr(savedErrno));
+    return sysCallFailure(callName, SBuf(xstrerr(savedErrno)));
 }
 
 #if _SQUID_WINDOWS_

diff --git a/src/base/File.h b/src/base/File.h
index 4a09de017f4563d53213b8aa7c362c95ac23cdac..959be4e333c7946a262d85283469b66e12acbe61 100644 (file)
--- a/src/base/File.h
+++ b/src/base/File.h
@@ -105,7 +105,7 @@ protected:
     void close();
 
     /// \returns a description a system call-related failure
-    SBuf sysCallFailure(const char *callName, const char *error) const;
+    SBuf sysCallFailure(const char *callName, const SBuf &error) const;
     /// \returns a description of an errno-based system call failure
     SBuf sysCallError(const char *callName, const int savedErrno) const;
 

diff --git a/src/tests/stub_libanyp.cc b/src/tests/stub_libanyp.cc
index 47dfb49309f8cb88c58c39f534e2da21cf9cda75..16d3ccdb3dc9de702f6ca7944201d92848d3218b 100644 (file)
--- a/src/tests/stub_libanyp.cc
+++ b/src/tests/stub_libanyp.cc
@@ -36,7 +36,7 @@ bool urlIsRelative(const char *) STUB_RETVAL(false)
 char *urlMakeAbsolute(const HttpRequest *, const char *)STUB_RETVAL(nullptr)
 char *urlRInternal(const char *, unsigned short, const char *, const char *) STUB_RETVAL(nullptr)
 char *urlInternal(const char *, const char *) STUB_RETVAL(nullptr)
-int matchDomainName(const char *, const char *, uint) STUB_RETVAL(0)
+int matchDomainName(const char *, const char *, enum MatchDomainNameFlags) STUB_RETVAL(0)
 int urlCheckRequest(const HttpRequest *) STUB_RETVAL(0)
 char *urlHostname(const char *) STUB_RETVAL(nullptr)
 void urlExtMethodConfigure() STUB