From 21945be4c4ef822b7dc5f6ded80027bd5437ce9d Mon Sep 17 00:00:00 2001
From: Vincent Richard <vincent@vincent-richard.net>
Date: Sun, 24 Mar 2013 12:30:26 +0100
Subject: Fixed warnings and 64-bit issues.

---
 src/net/tls/gnutls/TLSSocket_GnuTLS.cpp               | 2 +-
 src/parsingContext.cpp                                | 2 +-
 src/platforms/posix/posixHandler.cpp                  | 6 +++---
 src/platforms/windows/windowsHandler.cpp              | 4 ++--
 src/security/cert/gnutls/X509Certificate_GnuTLS.cpp   | 6 +++---
 src/security/cert/openssl/X509Certificate_OpenSSL.cpp | 2 +-
 src/utility/random.cpp                                | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/net/tls/gnutls/TLSSocket_GnuTLS.cpp b/src/net/tls/gnutls/TLSSocket_GnuTLS.cpp
index 4c789381..0a24b720 100644
--- a/src/net/tls/gnutls/TLSSocket_GnuTLS.cpp
+++ b/src/net/tls/gnutls/TLSSocket_GnuTLS.cpp
@@ -206,7 +206,7 @@ TLSSocket::size_type TLSSocket_GnuTLS::sendRawNonBlocking(const char* buffer, co
 			return 0;
 		}
 
-		TLSSession_GnuTLS::throwTLSException("gnutls_record_send", ret);
+		TLSSession_GnuTLS::throwTLSException("gnutls_record_send", static_cast <int>(ret));
 	}
 
 	return static_cast <size_type>(ret);
diff --git a/src/parsingContext.cpp b/src/parsingContext.cpp
index b440ef1e..527f4705 100644
--- a/src/parsingContext.cpp
+++ b/src/parsingContext.cpp
@@ -34,7 +34,7 @@ parsingContext::parsingContext()
 
 
 parsingContext::parsingContext(const parsingContext& ctx)
-	: context()
+	: context(ctx)
 {
 }
 
diff --git a/src/platforms/posix/posixHandler.cpp b/src/platforms/posix/posixHandler.cpp
index f06c865f..73005d7e 100644
--- a/src/platforms/posix/posixHandler.cpp
+++ b/src/platforms/posix/posixHandler.cpp
@@ -123,9 +123,9 @@ posixHandler::~posixHandler()
 }
 
 
-unsigned int posixHandler::getUnixTime() const
+unsigned long posixHandler::getUnixTime() const
 {
-	return ::time(NULL);
+	return static_cast <unsigned long>(::time(NULL));
 }
 
 
@@ -156,7 +156,7 @@ const vmime::datetime posixHandler::getCurrentLocalTime() const
 	gmt.tm_isdst = -1;
 
 	// Calculate the difference (in seconds)
-	const int diff = ::mktime(&local) - ::mktime(&gmt);
+	const long diff = ::mktime(&local) - ::mktime(&gmt);
 
 	// Return the date
 	return vmime::datetime(local.tm_year + 1900, local.tm_mon + 1, local.tm_mday,
diff --git a/src/platforms/windows/windowsHandler.cpp b/src/platforms/windows/windowsHandler.cpp
index 99b52cdf..f306710f 100644
--- a/src/platforms/windows/windowsHandler.cpp
+++ b/src/platforms/windows/windowsHandler.cpp
@@ -71,9 +71,9 @@ windowsHandler::~windowsHandler()
 }
 
 
-unsigned int windowsHandler::getUnixTime() const
+unsigned long windowsHandler::getUnixTime() const
 {
-	return static_cast <unsigned int>(::time(NULL));
+	return static_cast <unsigned long>(::time(NULL));
 }
 
 
diff --git a/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp b/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp
index fd1343dd..96137844 100644
--- a/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp
+++ b/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp
@@ -96,7 +96,7 @@ ref <X509Certificate> X509Certificate::import(utility::inputStream& is)
 
 	while (!is.eof())
 	{
-		const int len = is.read(chunk, sizeof(chunk));
+		const utility::stream::size_type len = is.read(chunk, sizeof(chunk));
 		bytes.insert(bytes.end(), chunk, chunk + len);
 	}
 
@@ -106,11 +106,11 @@ ref <X509Certificate> X509Certificate::import(utility::inputStream& is)
 
 // static
 ref <X509Certificate> X509Certificate::import
-	(const byte_t* data, const unsigned int length)
+	(const byte_t* data, const size_t length)
 {
 	gnutls_datum buffer;
 	buffer.data = const_cast <byte_t*>(data);
-	buffer.size = length;
+	buffer.size = static_cast <unsigned int>(length);
 
 	// Try DER format
 	ref <X509Certificate_GnuTLS> derCert = vmime::create <X509Certificate_GnuTLS>();
diff --git a/src/security/cert/openssl/X509Certificate_OpenSSL.cpp b/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
index ff2062c1..61be0d6d 100755
--- a/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
+++ b/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
@@ -185,7 +185,7 @@ ref <X509Certificate> X509Certificate::import(utility::inputStream& is)
 
 // static
 ref <X509Certificate> X509Certificate::import
-	(const byte_t* data, const unsigned int length)
+	(const byte_t* data, const size_t length)
 {
 	ref <X509Certificate_OpenSSL> cert = vmime::create <X509Certificate_OpenSSL>();
 
diff --git a/src/utility/random.cpp b/src/utility/random.cpp
index 5dda639d..6e96ed4e 100644
--- a/src/utility/random.cpp
+++ b/src/utility/random.cpp
@@ -46,7 +46,7 @@ unsigned int random::getNext()
 
 unsigned int random::getTime()
 {
-	return (platform::getHandler()->getUnixTime());
+	return static_cast <unsigned int>((platform::getHandler()->getUnixTime()));
 }
 
 
-- 
cgit