summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-07-26 08:27:50 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-07-26 08:27:50 +0000
commitc373382c1edabd134c938e3c272ee40b5ee590b6 (patch)
tree934a209164285206461be81c86698d0c6172c83c
parent5a2e9a2587372aeb4b74fa1aadf53283ed7cae10 (diff)
downloadopenvpn-c373382c1edabd134c938e3c272ee40b5ee590b6.zip
openvpn-c373382c1edabd134c938e3c272ee40b5ee590b6.tar.gz
openvpn-c373382c1edabd134c938e3c272ee40b5ee590b6.tar.xz
Fixed compiler warnings in Windows build (MinGW).
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3125 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r--buffer.c4
-rw-r--r--cryptoapi.c2
-rw-r--r--error.c2
-rw-r--r--pkcs11.c2
-rw-r--r--route.c2
-rw-r--r--win32.c1
6 files changed, 8 insertions, 5 deletions
diff --git a/buffer.c b/buffer.c
index b62d4b8..0fe9b61 100644
--- a/buffer.c
+++ b/buffer.c
@@ -35,9 +35,9 @@
size_t
array_mult_safe (const size_t m1, const size_t m2)
{
- const unsigned long long limit = 0xFFFFFFFF;
+ const size_t limit = 0xFFFFFFFF;
unsigned long long res = (unsigned long long)m1 * (unsigned long long)m2;
- if (unlikely(m1 > limit) || unlikely(m2 > limit) || unlikely(res > limit))
+ if (unlikely(m1 > limit) || unlikely(m2 > limit) || unlikely(res > (unsigned long long)limit))
msg (M_FATAL, "attemped allocation of excessively large array");
return (size_t) res;
}
diff --git a/cryptoapi.c b/cryptoapi.c
index 9324b27..3b78e2b 100644
--- a/cryptoapi.c
+++ b/cryptoapi.c
@@ -369,7 +369,7 @@ int SSL_CTX_use_CryptoAPI_certificate(SSL_CTX *ssl_ctx, const char *cert_prop)
}
/* cert_context->pbCertEncoded is the cert X509 DER encoded. */
- cert = d2i_X509(NULL, (unsigned char **) &cd->cert_context->pbCertEncoded,
+ cert = d2i_X509(NULL, (const unsigned char **) &cd->cert_context->pbCertEncoded,
cd->cert_context->cbCertEncoded);
if (cert == NULL) {
SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_ASN1_LIB);
diff --git a/error.c b/error.c
index 842ad83..f1e7996 100644
--- a/error.c
+++ b/error.c
@@ -78,7 +78,9 @@ static bool use_syslog; /* GLOBAL */
static bool suppress_timestamps; /* GLOBAL */
/* The program name passed to syslog */
+#if SYSLOG_CAPABILITY
static char *pgmname_syslog; /* GLOBAL */
+#endif
/* If non-null, messages should be written here (used for debugging only) */
static FILE *msgfp; /* GLOBAL */
diff --git a/pkcs11.c b/pkcs11.c
index d2f3c80..a58a00c 100644
--- a/pkcs11.c
+++ b/pkcs11.c
@@ -436,7 +436,9 @@ pkcs11_management_id_get (
) {
pkcs11h_certificate_id_list_t id_list = NULL;
pkcs11h_certificate_id_list_t entry = NULL;
+#if 0 /* certificate_id seems to be unused -- JY */
pkcs11h_certificate_id_t certificate_id = NULL;
+#endif
pkcs11h_certificate_t certificate = NULL;
CK_RV rv = CKR_OK;
char *certificate_blob = NULL;
diff --git a/route.c b/route.c
index 47a6013..5b7b036 100644
--- a/route.c
+++ b/route.c
@@ -2041,7 +2041,7 @@ static void
get_bypass_addresses (struct route_bypass *rb, const unsigned int flags)
{
struct gc_arena gc = gc_new ();
- bool ret_bool = false;
+ /*bool ret_bool = false;*/
/* get full routing table */
const MIB_IPFORWARDTABLE *routes = get_windows_routing_table (&gc);
diff --git a/win32.c b/win32.c
index ec9247e..e6d7b48 100644
--- a/win32.c
+++ b/win32.c
@@ -774,7 +774,6 @@ getpass (const char *prompt)
static bool
cmp_prefix (const char *str, const bool n, const char *pre)
{
- const size_t len = strlen (pre);
size_t i = 0;
if (!str)