tidying

diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c
index 0a4f92e4f492ee6696fab6ba93d782127f6f3aab..925e88e053133bf52966502eeda64a8458e059a4 100644 (file)
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -220,18 +220,8 @@ int     string_datestamp_type  = -1;
 
 BOOL    timestamps_utc         = FALSE;
 tls_support tls_in = {
- {-1}, /* tls_active */
- 0,    /* bits */
- FALSE,        /* tls_certificate_verified */
-#ifdef SUPPORT_DANE
- FALSE, /* dane_verified */
- 0,     /* tlsa_usage */
-#endif
- NULL, /* tls_cipher */
- FALSE,        /* tls_on_connect */
- NULL, /* tls_on_connect_ports */
- NULL, /* tls_peerdn */
- NULL  /* tls_sni */
+ .active = { .sock = -1 }
+ /* remainder zero/null/false */
 };
 
 tree_node *tree_duplicates     = NULL;

diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index 3d404f100865e59e6519a2ee3f7e25d248ad4fa0..426714f9113dee0ea6e1c57d71aab8d39972b0a2 100644 (file)
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -953,21 +953,18 @@ else if (isgroup)
 defined. */
 
 if (have_auth)
-  {
   if (!support_crypteq) fprintf(new, "/* Force SUPPORT_CRYPTEQ for AUTH */\n"
     "#define SUPPORT_CRYPTEQ\n");
-  }
 
 /* Check poll() for timer functionality.
 Some OS' have released with it broken. */
 
   {
   struct timeval before, after;
-  int rc;
   size_t us;
 
   gettimeofday(&before, NULL);
-  rc = poll(NULL, 0, 500);
+  (void) poll(NULL, 0, 500);
   gettimeofday(&after, NULL);
 
   us = (after.tv_sec - before.tv_sec) * 1000000 +