Compiler quietening

diff --git a/src/src/dkim.c b/src/src/dkim.c
index 1767eb6206b8bd1ba3ee5e43cb4bf4383a1961eb..043fcc6dc790e55d0d02195b3e70a0a61c1ec084 100644 (file)
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -791,7 +791,7 @@ gstring *
 authres_dkim(gstring * g)
 {
 pdkim_signature * sig;
 authres_dkim(gstring * g)
 {
 pdkim_signature * sig;

-int start;
+int start = 0;         /* compiler quietening */

 
 DEBUG(D_acl) start = g->ptr;
 
 
 DEBUG(D_acl) start = g->ptr;
 

diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index d7e6d5bce008e9cd9c5526be73b6202ccc1e950f..457d83efc7c6d2f362791bcbaedaf142cfb117d0 100644 (file)
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -792,7 +792,7 @@ pdkim_signature * sig;
 
 for (b = ctx->bodyhash; b; b = b->next)                /* Finish hashes */
   {
 
 for (b = ctx->bodyhash; b; b = b->next)                /* Finish hashes */
   {

-  DEBUG(D_acl) debug_printf("PDKIM: finish bodyhash %d/%d/%d len %d\n",
+  DEBUG(D_acl) debug_printf("PDKIM: finish bodyhash %d/%d/%d len %ld\n",

            b->hashtype, b->canon_method, b->bodylength, b->signed_body_bytes);
   exim_sha_finish(&b->body_hash_ctx, &b->bh);
   }
            b->hashtype, b->canon_method, b->bodylength, b->signed_body_bytes);
   exim_sha_finish(&b->body_hash_ctx, &b->bh);
   }


@@ -1922,12 +1922,12 @@ for (b = ctx->bodyhash; b; b = b->next)
      && canon_method == b->canon_method
      && bodylength == b->bodylength)
     {
      && canon_method == b->canon_method
      && bodylength == b->bodylength)
     {

-    DEBUG(D_receive) debug_printf("PDKIM: using existing bodyhash %d/%d/%d\n",
+    DEBUG(D_receive) debug_printf("PDKIM: using existing bodyhash %d/%d/%ld\n",

                                  hashtype, canon_method, bodylength);
     return b;
     }
 
                                  hashtype, canon_method, bodylength);
     return b;
     }
 

-DEBUG(D_receive) debug_printf("PDKIM: new bodyhash %d/%d/%d\n",
+DEBUG(D_receive) debug_printf("PDKIM: new bodyhash %d/%d/%ld\n",

                              hashtype, canon_method, bodylength);
 b = store_get(sizeof(pdkim_bodyhash));
 b->next = ctx->bodyhash;
                              hashtype, canon_method, bodylength);
 b = store_get(sizeof(pdkim_bodyhash));
 b->next = ctx->bodyhash;

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 3376dce3f4410d95f886d5683c00904beff97a0c..969a99d997a4658328e25e29948ba5dc29de4a55 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -1857,8 +1857,6 @@ if (expcerts && *expcerts)
       */
       if (file)
        {
       */
       if (file)
        {

-       tls_ext_ctx_cb * cbinfo = host
-         ? client_static_cbinfo : server_static_cbinfo;

        STACK_OF(X509_NAME) * names = SSL_load_client_CA_file(CS file);
 
        SSL_CTX_set_client_CA_list(sctx, names);
        STACK_OF(X509_NAME) * names = SSL_load_client_CA_file(CS file);
 
        SSL_CTX_set_client_CA_list(sctx, names);